gitlab-ce/app
Grzegorz Bizon 92673c2c63 Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobs
* master: (275 commits)
  Decrease Metrics/PerceivedComplexity threshold to 17
  Upgrade mail and nokogiri gems due to security issues
  Link out to stackoverflow answer on setting swappiness
  Document swappiness recomendations in the requirements doc
  Fix invalid attribute used for time-ago-tooltip component
  Update latest artifacts doc
  Add changelog entry for flipping verify_certificates
  Default LDAP config verify_certificates to true
  Update share project with groups docs
  remove accidental console.log from karma tests
  update specs to match reorganized monitoring components
  Remove tooltips from new sidebar
  Use `git update-ref --stdin -z` to delete refs
  Don't use public_send in destroy_conditionally! helper
  Remove unused expressions policy from ci/cd config
  Simplify code for appending strategies in CI/CD config
  Raise exception when simplifiable ci entry incomplete
  Add changelog entry
  Fix MySQL failure for emoji autocomplete
  max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably)
  ...

Conflicts:
	lib/gitlab/ci/config/entry/policy.rb
2017-08-31 14:02:52 +02:00
..
assets Merge branch 'winh-merge-request-version-dropdowns' into 'master' 2017-08-31 07:53:32 +00:00
controllers Fix MySQL failure for emoji autocomplete 2017-08-30 11:30:12 +01:00
finders Add filter by my reaction 2017-08-30 07:48:55 +00:00
helpers Remove tooltips from new sidebar 2017-08-30 16:55:01 +01:00
mailers
models Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobs 2017-08-31 14:02:52 +02:00
policies replace `is_team_member?` with `team_member?` 2017-08-29 11:14:42 +03:00
presenters
serializers
services Use `git update-ref --stdin -z` to delete refs 2017-08-30 22:01:23 +08:00
uploaders
validators
views Remove tooltips from new sidebar 2017-08-30 16:55:01 +01:00
workers Track enqueued and ongoing MRs 2017-08-28 15:48:09 -03:00