CE upstream
Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution)
both modified: .gitlab-ci.yml
deleted by them: app/assets/stylesheets/pages/admin.scss
both modified: app/assets/stylesheets/pages/issuable.scss
both modified: app/controllers/projects/issues_controller.rb
both modified: app/helpers/projects_helper.rb
both modified: config/routes/group.rb
both modified: doc/api/merge_requests.md
both modified: lib/api/users.rb
both modified: spec/controllers/projects/issues_controller_spec.rb
both modified: spec/finders/merge_requests_finder_spec.rb
both modified: spec/services/projects/create_service_spec.rb
both modified: spec/services/system_note_service_spec.rb