Skip to content

CE 10.2 stable into EE 10.2 stable

Conflicts generated when following https://gitlab.com/gitlab-org/release-tools/blob/master/doc/merge-ce-into-ee.md#merging-a-ce-stable-branch-into-its-ee-counterpart.

  • UU app/assets/javascripts/boards/stores/boards_store.js
  • UU app/assets/javascripts/dispatcher.js
  • UU app/assets/javascripts/milestone_select.js
  • AA app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
  • UU app/assets/stylesheets/framework/avatar.scss
  • UU app/assets/stylesheets/framework/modal.scss
  • UU app/assets/stylesheets/framework/secondary-navigation-elements.scss
  • UU app/controllers/concerns/issuable_actions.rb
  • UU app/controllers/concerns/lfs_request.rb
  • UU app/controllers/projects/issues_controller.rb
  • UU app/controllers/projects/refs_controller.rb
  • UU app/models/group.rb
  • UU app/models/merge_request.rb
  • UU app/models/repository.rb
  • UU app/models/user.rb
  • UU app/views/projects/tags/index.html.haml
  • UU app/workers/repository_import_worker.rb
  • UU config/initializers/8_metrics.rb
  • UU config/routes/group.rb
  • UU db/schema.rb
  • UU doc/api/merge_requests.md
  • UU lib/gitlab/checks/change_access.rb
  • UU lib/gitlab/github_import/client.rb
  • UU lib/gitlab/metrics/transaction.rb
  • UU lib/gitlab/usage_data.rb
  • UU spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
  • UU spec/lib/gitlab/checks/change_access_spec.rb
  • UU spec/lib/gitlab/github_import/client_spec.rb
  • UU spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
  • UU spec/lib/gitlab/metrics/web_transaction_spec.rb
  • UU spec/lib/gitlab/usage_data_spec.rb
  • UU spec/models/merge_request_spec.rb
  • UU spec/requests/api/groups_spec.rb
  • UU spec/requests/lfs_http_spec.rb
  • UU spec/support/kubernetes_helpers.rb

cc @mkozono @winh @tiagonbotelho

Edited by Oswaldo Ferreira

Merge request reports