CE => EE 9.3 RC2
Below are the merge conflicts that occurred while trying to merge 9-3-stable
into 9-3-stable-ee
for %9.3 RC2.
-
@psimyn please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/javascripts/boards/models/list.js -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/javascripts/dispatcher.js -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/javascripts/environments/components/environment_item.vue -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/javascripts/environments/components/environments_table.vue -
@ClemMakesApps please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/javascripts/pipelines/components/graph/graph_component.vue -
@mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/javascripts/project_new.js -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/javascripts/vue_merge_request_widget/dependencies.js -
@brycepj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/stylesheets/framework/mobile.scss -
@ClemMakesApps please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/stylesheets/framework/sidebar.scss -
@mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/stylesheets/framework/variables.scss -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/stylesheets/pages/environments.scss -
@brycepj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/stylesheets/pages/pipelines.scss -
@mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/assets/stylesheets/pages/projects.scss -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/controllers/concerns/lfs_request.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/controllers/concerns/membership_actions.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/controllers/projects/deploy_keys_controller.rb -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/controllers/projects/imports_controller.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/controllers/projects/issues_controller.rb -
@jamedjo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/controllers/projects/protected_refs_controller.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/controllers/sessions_controller.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/helpers/button_helper.rb -
@rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/helpers/dropdowns_helper.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/models/ci/pipeline.rb -
@jamedjo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/models/concerns/protected_ref.rb -
@yorickpeterse please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/models/project.rb -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/models/project_services/deployment_service.rb -
@smcgivern please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/policies/group_policy.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/serializers/pipeline_details_entity.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/serializers/pipeline_serializer.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/services/boards/create_service.rb -
@zj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/services/ci/create_pipeline_service.rb -
@rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/services/issuable_base_service.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/services/members/create_service.rb -
@vsizov please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/services/slash_commands/interpret_service.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/uploaders/gitlab_uploader.rb -
@jameslopez please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/layouts/nav/_admin.html.haml -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/projects/commits/_head.html.haml -
@brycepj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/projects/issues/index.html.haml -
@ClemMakesApps please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/projects/issues/show.html.haml -
@tauriedavis please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/projects/project_members/_index.html.haml -
@tauriedavis please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/projects/project_members/_new_project_member.html.haml -
@mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/projects/protected_tags/_index.html.haml -
@mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/projects/settings/repository/show.html.haml -
@brycepj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/shared/issuable/_search_bar.html.haml -
@brycepj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/views/shared/issuable/form/_merge_params.html.haml -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/app/workers/repository_import_worker.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/config/routes/user.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/db/schema.rb -
@axil please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/doc/ci/docker/using_docker_images.md -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/doc/ci/examples/code_climate.md -
@axil please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/doc/ci/triggers/README.md -
@axil please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/doc/ci/variables/README.md -
@oswaldo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/features/support/env.rb -
@twk3 please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/lib/api/api.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/lib/api/groups.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/lib/gitlab/checks/change_access.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/lib/gitlab/git_access.rb -
@brodock please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/lib/tasks/gitlab/check.rake -
@oswaldo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/controllers/projects/merge_requests_controller_spec.rb -
@brodock please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/db/production/settings.rb -
@tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/factories/projects.rb -
@timzallmann please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/features/admin/admin_groups_spec.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/features/boards/sidebar_spec.rb -
@ClemMakesApps please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/features/issues/form_spec.rb -
@mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/features/protected_branches_spec.rb -
@oswaldo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/fixtures/api/schemas/entities/merge_request.json -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/javascripts/issue_show/mock_data.js -
@ClemMakesApps please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/javascripts/notes_spec.js -
@brycepj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/javascripts/pipelines/graph/graph_component_spec.js -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/lib/gitlab/git_access_spec.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/lib/gitlab/git_access_wiki_spec.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/lib/gitlab/import_export/all_models.yml -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/models/forked_project_link_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/models/project_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/models/user_spec.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/requests/api/users_spec.rb -
@mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/requests/git_http_spec.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/serializers/pipeline_details_entity_spec.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/serializers/pipeline_serializer_spec.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/services/create_deployment_service_spec.rb -
@godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/services/projects/fork_service_spec.rb -
@dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/services/wiki_pages/create_service_spec.rb -
@dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/services/wiki_pages/destroy_service_spec.rb -
@dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/services/wiki_pages/update_service_spec.rb -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-9-3-rc2/spec/spec_helper.rb
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-9-3-rc2
branch.
People mentioned here are picked by git log -1 -- FILENAME
. If you are wrong person to resolve the conflict - please ping me.
Thanks for help!
Edited by Clement Ho