Skip to content

CE Upstream - Monday

Rémy Coutable requested to merge rc/ce-to-ee-monday into master

Resolved conflicts:

UU .gitlab-ci.yml
UU README.md
UU app/assets/stylesheets/pages/groups.scss
UU app/controllers/projects/deploy_keys_controller.rb
UU app/controllers/projects/merge_requests_controller.rb
UU doc/api/users.md
UU doc/api/v3_to_v4.md
UU spec/models/namespace_spec.rb
UU spec/models/repository_spec.rb
UU spec/support/test_env.rb

Merge request reports