Skip to content

CE upstream

Nick Thomas requested to merge ce-to-ee into master 
both modified:   app/assets/javascripts/application.js
both modified:   app/assets/javascripts/boards/boards_bundle.js.es6
both modified:   app/assets/javascripts/boards/services/board_service.js.es6
both modified:   app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
both modified:   app/helpers/merge_requests_helper.rb
both modified:   app/models/repository.rb
both modified:   app/services/boards/create_service.rb
both modified:   app/services/merge_requests/build_service.rb
both modified:   app/services/merge_requests/merge_service.rb
both modified:   app/services/search/global_service.rb
both modified:   app/views/projects/edit.html.haml
both modified:   app/views/projects/merge_requests/widget/open/_accept.html.haml
both modified:   app/views/shared/_import_form.html.haml
both added:      app/views/shared/issuable/form/_merge_params.html.haml
both modified:   app/views/shared/web_hooks/_form.html.haml
both modified:   doc/api/services.md
both added:      spec/features/merge_requests/widget_spec.rb
both modified:   spec/lib/gitlab/git_access_spec.rb
both modified:   spec/models/repository_spec.rb
both modified:   spec/services/boards/create_service_spec.rb
both modified:   spec/services/boards/issues/list_service_spec.rb
both modified:   spec/services/boards/issues/move_service_spec.rb
both modified:   spec/services/boards/lists/move_service_spec.rb
both modified:   spec/services/merge_requests/refresh_service_spec.rb

Got into a bit of a mess with the last one, trying again

Merge request reports