CE upstream
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: app/assets/javascripts/pipelines/components/async_button.vue
both modified: app/controllers/admin/users_controller.rb
both modified: app/helpers/button_helper.rb
deleted by them: features/steps/dashboard/merge_requests.rb
both modified: lib/gitlab/ldap/access.rb
both modified: lib/gitlab/usage_data.rb
both modified: spec/lib/gitlab/usage_data_spec.rb
both modified: spec/models/merge_request_spec.rb