Skip to content

CE upstream: Thursday

Nick Thomas requested to merge ce-to-ee into master

Conflicts:

both modified:   .rubocop_todo.yml
both modified:   CHANGELOG.md
both modified:   Gemfile.lock
both modified:   VERSION
both modified:   app/controllers/concerns/service_params.rb
both modified:   app/helpers/tab_helper.rb
both modified:   app/models/project.rb
both modified:   app/models/protected_branch.rb
both modified:   app/views/layouts/nav/_admin.html.haml
both modified:   app/views/layouts/nav/_group.html.haml
both modified:   doc/api/merge_requests.md
both modified:   doc/api/projects.md
both modified:   doc/api/v3_to_v4.md
both modified:   lib/api/builds.rb
both added:      lib/api/v3/notes.rb
both modified:   lib/gitlab/chat_commands/presenters/issue_base.rb
both modified:   lib/gitlab/git_access.rb
both modified:   lib/gitlab/saml/user.rb
both modified:   lib/gitlab/shell.rb
both modified:   lib/gitlab/upgrader.rb
both modified:   lib/tasks/gitlab/info.rake
both modified:   spec/lib/gitlab/git_access_spec.rb
both modified:   spec/lib/gitlab/upgrader_spec.rb
both modified:   spec/requests/lfs_http_spec.rb
both modified:   spec/support/test_env.rb

Merge request reports