9.3.0-ee-rc2 CE to EE merge
This MR intends to merge 9-3-stable into 9-3-stable-ee for RC2, these are the merge conflicts that occurred while performing merge locally
-
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/assets/javascripts/environments/components/environments_table.vue -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/assets/javascripts/issue_show/components/edited.vue -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/concerns/membership_actions.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/projects/deploy_keys_controller.rb -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/projects/imports_controller.rb -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/projects/issues_controller.rb -
@jamedjo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/projects/protected_refs_controller.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/sessions_controller.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/helpers/button_helper.rb -
@rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/helpers/dropdowns_helper.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/models/ci/pipeline.rb -
@jamedjo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/models/concerns/protected_ref.rb -
@yorickpeterse please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/models/project.rb -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/models/project_services/deployment_service.rb -
@smcgivern please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/policies/group_policy.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/serializers/pipeline_details_entity.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/serializers/pipeline_serializer.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/boards/create_service.rb -
@zj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/ci/create_pipeline_service.rb -
@rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/issuable_base_service.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/members/create_service.rb -
@vsizov please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/slash_commands/interpret_service.rb -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/workers/repository_import_worker.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/config/routes/user.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/db/schema.rb -
@oswaldo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/features/support/env.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/lib/api/groups.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/lib/gitlab/checks/change_access.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/lib/gitlab/git_access.rb -
@brodock please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/lib/tasks/gitlab/check.rake -
@oswaldo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/controllers/projects/merge_requests_controller_spec.rb -
@brodock please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/db/production/settings.rb -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/factories/projects.rb -
@timzallmann please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/features/admin/admin_groups_spec.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/features/boards/sidebar_spec.rb -
@ClemMakesApps please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/features/issues/form_spec.rb -
@mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/features/protected_branches_spec.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/lib/gitlab/git_access_spec.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/lib/gitlab/git_access_wiki_spec.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/lib/gitlab/import_export/all_models.yml -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/models/forked_project_link_spec.rb -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/models/project_spec.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/models/user_spec.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/requests/api/users_spec.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/requests/git_http_spec.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/serializers/pipeline_details_entity_spec.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/serializers/pipeline_serializer_spec.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/create_deployment_service_spec.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/projects/fork_service_spec.rb -
@dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/wiki_pages/create_service_spec.rb -
@dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/wiki_pages/destroy_service_spec.rb -
@dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/wiki_pages/update_service_spec.rb -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/spec_helper.rb
Once conflicts are resolved, push your changes to this branch, again, don't force push!.
Edited by Valery Sizov