Skip to content

CE to EE Merge for 9.5 RC1

Jose Ivan Vargas Lopez requested to merge ce-to-ee-9-5-rc-1 into 9-5-stable-ee

Current Conflicts

  • .haml-lint.yml
  • Gemfile
  • Gemfile.lock
  • app/assets/javascripts/api.js
  • app/assets/javascripts/dispatcher.js
  • app/assets/javascripts/new_sidebar.js
  • app/assets/javascripts/project_select.js
  • app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
  • app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
  • app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js
  • app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
  • app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
  • app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
  • app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
  • app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
  • app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
  • app/assets/stylesheets/framework/variables.scss
  • app/assets/stylesheets/new_sidebar.scss
  • app/assets/stylesheets/pages/merge_requests.scss
  • app/controllers/admin/health_check_controller.rb
  • app/controllers/omniauth_callbacks_controller.rb
  • app/helpers/dropdowns_helper.rb
  • app/models/merge_request.rb
  • app/models/project_import_data.rb
  • app/models/repository.rb
  • app/views/layouts/nav/_new_group_sidebar.html.haml
  • app/views/projects/jobs/_sidebar.html.haml
  • app/views/projects/tree/_tree_content.html.haml
  • app/views/projects/tree/_tree_header.html.haml
  • app/views/shared/_import_form.html.haml
  • both added: app/views/shared/_sidebar_toggle_button.html.ham
  • app/views/shared/issuable/_sidebar.html.haml
  • config/webpack.config.js
  • lib/api/entities.rb
  • lib/gitlab/usage_data.rb
  • spec/features/merge_requests/closes_issues_spec.rb
  • spec/fixtures/api/schemas/entities/merge_request.json
  • spec/initializers/6_validations_spec.rb
  • spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js
  • spec/lib/gitlab/shell_spec.rb
  • spec/serializers/merge_request_entity_spec.rb
  • spec/services/wiki_pages/update_service_spec.rb
Edited by Simon Knox

Merge request reports