Skip to content

Merge RC2 into 9.3 (actually-stable)

username-removed-408677 requested to merge 9-3-actually-stable-ee-rc2 into 9-3-actually-stable-ee

Checklist

Please refer to https://gitlab.com/gitlab-org/gitlab-ce/snippets/1664866 for the diff changes when check the files below

If any files need to be modified, please push (no force-push!) to the 9-3-actually-stable-ee-rc2 branch.

Steps taken

  1. git merge -Xtheirs 86051969bd10f2c75540add61424aa12bb21e265 (https://gitlab.com/gitlab-org/gitlab-ee/commit/088eab2d420d29836a5f136e3ac98edf29e9bf15)

  2. timeline.scss was missing a brace, so I fixed it in (https://gitlab.com/gitlab-org/gitlab-ee/commit/6eec80fe718f01bd534f0a084ca352f538a5a259)

Step 1 also led to:

deleted by them: app/assets/javascripts/issue_show/issue_title_description.vue
deleted by them: app/assets/javascripts/projects/settings_service_desk/service_desk_root.js
deleted by them: app/workers/geo_backfill_worker.rb
deleted by them: spec/javascripts/commit/pipelines/mock_data.js
deleted by them: spec/javascripts/issue_show/issue_title_description_spec.js
deleted by them: spec/support/wait_for_vue_resource.rb
deleted by them: spec/workers/geo/geo_backfill_worker_spec.rb
deleted by them: spec/workers/repository_update_mirror_dispatch_worker_spec.rb

  1. So I removed those files in https://gitlab.com/gitlab-org/gitlab-ee/commit/c0175b1a3b7a955b41b67d515df45692fc8105b4

  2. Found a missing end in a spec (bad merge conflict), so it got fixed in https://gitlab.com/gitlab-org/gitlab-ee/commit/3bcabf1fb606492f19394db8b27b4b1069555dc2

  3. Removed duplicate prometheus_ping_url as seen in commit

  4. Remove duplicate key in graph_component.vue

  5. Fix bad merge of users_select.js

  6. Cherry pick https://gitlab.com/gitlab-org/gitlab-ee/commit/c86d9e1026250c7fa0d69d20319854d9f6101b16

Edited by kushalpandya

Merge request reports