Skip to content

CE Upstream - Wednesday

username-removed-128633 requested to merge rc/ce-to-ee-wednesday into master

Resolved conflicts:

UU app/assets/javascripts/environments/components/environment.js.es6
UU app/controllers/projects/notes_controller.rb
UU app/services/merge_requests/merge_service.rb
UU app/views/layouts/header/_default.html.haml
UU app/views/layouts/nav/_dashboard.html.haml
UU app/views/layouts/nav/_group.html.haml
UU doc/api/issues.md
UU doc/user/project/slash_commands.md
UU lib/api/api.rb
UU spec/requests/api/users_spec.rb
UU spec/services/slash_commands/interpret_service_spec.rb

Merge request reports