Skip to content

Merge `9-2-stable` to `9-2-stable-ee` for `9.2.0-rc7`

username-removed-407765 requested to merge 9-2-stable-upstream into 9-2-stable-ee
  • There are a number of conflicts while merging 9-2-stable to 9-2-stable-ee for 9.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

Edited by username-removed-642931

Merge request reports