gitlab-org--gitlab-foss/app
Mike Greiling 0994bbf9dd Merge branch 'master' into ide
* master: (86 commits)
  Show all labels
  33874 confidential issue redesign
  Exclude merge_jid on Import/Export attribute configuration
  Resolve "User dropdown in filtered search does not load avatar on `master`"
  Re-add column locked_at on migration rollback
  Group-level new issue & MR using previously selected project
  [EE Backport] Update log audit event in omniauth_callbacks_controller.rb
  more eagerly bail when the state is prevented
  Move locked_at removal to post-deployment migration
  Add class to other sidebars
  Improve mobile sidebar
  reduce iterations by keeping a count of remaining enablers
  Store & use ConvDev percentages returned by Version app
  Store MergeWorker JID on merge request, and clean up stuck merges
  Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
  DRY up caching in AbstractReferenceFilter
  Update CHANGELOG
  Add CHANGELOG entry
  Fix html structure Removes test for removed behavior
  Port form back to use form_tag
  ...
2017-08-07 22:44:47 -05:00
..
assets Merge branch 'master' into ide 2017-08-07 22:44:47 -05:00
controllers Merge branch 'master' into ide 2017-08-07 22:44:47 -05:00
finders Add workaround for UPDATE with subquery when using MySQL 2017-08-03 16:31:05 +02:00
helpers Merge branch 'master' into ide 2017-08-07 22:44:47 -05:00
mailers Rename many path_with_namespace -> full_path 2017-08-01 07:26:58 +02:00
models Merge branch 'master' into ide 2017-08-07 22:44:47 -05:00
policies Allow logged in users to read user list under public restriction 2017-08-01 07:46:13 +00:00
presenters Make commits behind text a link to the target branch commits page 2017-07-11 11:49:22 -05:00
serializers Merge branch 'master' into ide 2017-08-07 22:44:47 -05:00
services Merge branch '32844-issuables-performance' into 'master' 2017-08-07 21:21:29 +00:00
uploaders Rename more path_with_namespace -> full_path or disk_path 2017-08-01 07:28:13 +02:00
validators
views Merge branch 'master' into ide 2017-08-07 22:44:47 -05:00
workers Merge branch '31207-clean-locked-merge-requests' into 'master' 2017-08-08 01:47:48 +00:00