Skip to content

Ce to ee

Robert Speicher requested to merge ce-to-ee into master

Unresolved conflicts:

  • app/controllers/autocomplete_controller.rb
  • app/services/merge_requests/build_service.rb
  • app/views/layouts/notify.html.haml
  • app/views/projects/_builds_settings.html.haml
  • app/views/shared/issuable/_form.html.haml
  • app/workers/post_receive.rb
  • doc/ci/yaml/README.md
  • spec/controllers/projects/issues_controller_spec.rb

Merge request reports