CE Upstream - Monday
-
@rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/.gitlab-ci.yml -
@filipa please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/dispatcher.js -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/framework.scss -
@felipe_artur please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/framework/variables.scss -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/pages/boards.scss -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/pages/issuable.scss -
@felipe_artur please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/pages/note_form.scss -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/helpers/system_note_helper.rb -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/ci/pipeline.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/merge_request.rb -
@stanhu please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/project_services/chat_message/merge_message.rb -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/presenters/ci/pipeline_presenter.rb -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/layouts/header/_default.html.haml -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/_home_panel.html.haml -
@lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/_md_preview.html.haml -
@nolith please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/workers/build_finished_worker.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/db/schema.rb -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/api/issues.md -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/api/merge_requests.md -
@axil please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/development/i18n_guide.md -
@stanhu please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/update/mysql_to_postgresql.md -
@axil please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/user/permissions.md -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/features/support/env.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/api/entities.rb -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/api/issues.rb -
Vitaliy @blackst0ne Klachkov please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/api/merge_requests.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab/background_migration/create_fork_network_memberships_range.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab/background_migration/populate_fork_networks_range.rb -
Kamil Trzcinski please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab/usage_data.rb -
@to1ne please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/system_check/app/git_user_default_ssh_config_check.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/locale/gitlab.pot -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/merge_requests/diffs_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/projects/issuable_templates_spec.rb -
@blackst0ne please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/projects/user_uploads_files_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/projects_spec.rb -
Jose Ivan Vargas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/protected_branches_spec.rb -
@smcgivern please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/javascripts/vue_shared/components/issue/issue_warning_spec.js -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb -
Jacopo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/git_access_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/import_export/all_models.yml -
@dosuken123 please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/usage_data_spec.rb -
@to1ne please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb -
@nolith please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/ci/build_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/forked_project_link_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/namespace_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/services/merge_requests/conflicts/resolve_service_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/services/merge_requests/refresh_service_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/services/projects/update_service_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/support/project_forks_helper.rb -
@felipe_artur please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/support/test_env.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/views/projects/merge_requests/show.html.haml_spec.rb
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee
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 Dmytro Zaporozhets (DZ)