Merge `9-2-stable` to `9-2-stable-ee` for `9.2.0-rc7`
- There are a number of conflicts while merging
9-2-stable
to9-2-stable-ee
for9.2.0-rc7
- I've committed the conflicts as-is in this MR, to be merged into
9-2-stable-ee
Conflicts
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: VERSION
both modified: app/assets/javascripts/merge_request_tabs.js
both modified: app/assets/javascripts/notes.js
deleted by them: app/assets/javascripts/pipelines/components/stage.js
both modified: app/models/issue_assignee.rb
both modified: app/services/issuable_base_service.rb
both modified: app/views/shared/issuable/_sidebar.html.haml
both modified: app/views/shared/issuable/form/_metadata.html.haml
both modified: config/webpack.config.js
both modified: doc/api/issues.md
both modified: doc/ci/README.md
both modified: lib/gitlab/usage_data.rb
both modified: spec/controllers/groups_controller_spec.rb
both modified: spec/lib/gitlab/usage_data_spec.rb
both modified: spec/requests/api/issues_spec.rb
both modified: spec/workers/project_cache_worker_spec.rb
Fixes
-
@MadLittleMods / @iamphill (taken by @lbennett) - resolve app/assets/javascripts/merge_request_tabs.js
-
@MadLittleMods / @iamphill (taken by @lbennett) - resolve app/assets/javascripts/notes.js
-
@filipa / @fatihacet - resolve app/assets/javascripts/pipelines/components/stage.js
-
@vsizov / @smcgivern - resolve app/services/issuable_base_service.rb
-
@ClemMakesApps / @smcgivern (taken by @lbennett) - resolve app/views/shared/issuable/_sidebar.html.haml
-
@ClemMakesApps / @smcgivern (taken by @lbennett) - resolve app/views/shared/issuable/form/_metadata.html.haml
-
@filipa / @mikegreiling - resolve config/webpack.config.js
-
@vsizov / @smcgivern - resolve doc/api/issues.md
-
@axil / @zj - resolve doc/ci/README.md
(this should fix itself once https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1926 is picked into)9-2-stable-ee
-
@mkozono / @DouweM - resolve spec/controllers/groups_controller_spec.rb
-
@vsizov / @smcgivern - resolve spec/requests/api/issues_spec.rb
-
@to1ne / @DouweM - resolve spec/workers/project_cache_worker_spec.rb
Edited by username-removed-642931