Skip to content

CE upstream - Friday

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

A lot of conflicts today (aka "the feature-freeze effect"):

UU app/assets/javascripts/dispatcher.js
UU app/assets/javascripts/environments/folder/environments_folder_view.js
UU app/assets/javascripts/filtered_search/filtered_search_manager.js
UU app/assets/stylesheets/pages/projects.scss
UU app/controllers/projects/protected_branches_controller.rb
AA app/controllers/projects/protected_refs_controller.rb
AA app/controllers/projects/protected_tags_controller.rb
UU app/controllers/projects/settings/repository_controller.rb
UU app/helpers/branches_helper.rb
UU app/models/concerns/protected_branch_access.rb
UU app/models/group.rb
UU app/models/members/group_member.rb
UU app/models/project.rb
UU app/models/project_services/chat_message/merge_message.rb
UU app/models/protected_branch.rb
UU app/models/user.rb
UU app/services/projects/destroy_service.rb
UU app/views/admin/users/index.html.haml
UU app/views/projects/blob/_header.html.haml
UU app/views/projects/merge_requests/widget/open/_accept.html.haml
UU app/views/shared/_clone_panel.html.haml
UU app/views/shared/issuable/_search_bar.html.haml
UU config/routes/project.rb
UU db/schema.rb
UU doc/README.md
UU doc/api/issues.md
UU lib/gitlab/checks/change_access.rb
UU lib/gitlab/email/handler.rb
UU spec/features/projects/blobs/edit_spec.rb
AA spec/features/protected_tags/access_control_ce_spec.rb
UU spec/lib/gitlab/import_export/all_models.yml
UU spec/lib/gitlab/import_export/safe_model_attributes.yml
UU spec/models/project_services/chat_message/merge_message_spec.rb
UU spec/models/project_services/chat_message/pipeline_message_spec.rb
UU spec/models/project_spec.rb
UU spec/services/projects/destroy_service_spec.rb
UU yarn.lock

/cc @felipe_artur @godfat @selfup @timothyandrew please review since you're the RM/RM trainees for %9.1

Merge request reports