Skip to content

CE upstream: Thursday

Nick Thomas requested to merge ce-to-ee into master

Conflicts:

both modified:   Gemfile.lock
both modified:   app/controllers/projects/merge_requests_controller.rb
both modified:   app/models/project.rb
both modified:   app/serializers/merge_request_entity.rb
both modified:   app/services/merge_requests/refresh_service.rb
both modified:   app/services/todo_service.rb
both modified:   app/views/projects/blob/_actions.html.haml
both modified:   app/views/projects/merge_requests/merge.js.haml
both modified:   app/views/projects/merge_requests/widget/open/_accept.html.haml
both added:      changelogs/unreleased/remove-new-relic-gem.yml
both modified:   doc/api/enviroments.md
both modified:   doc/api/merge_requests.md
both modified:   doc/api/projects.md
both modified:   lib/api/entities.rb
both modified:   lib/api/v3/entities.rb
both modified:   lib/api/v3/merge_requests.rb
both modified:   spec/services/merge_requests/refresh_service_spec.rb

Merge request reports