Skip to content

CE upstream

Valery Sizov requested to merge ce-upstream into master

based on Dmitry's branch ce-to-ee.

Conflicts:

	both modified:   app/assets/stylesheets/pages/groups.scss
	both modified:   app/finders/issuable_finder.rb
	both modified:   app/models/user.rb
	both modified:   app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
	deleted by them: app/workers/stuck_ci_builds_worker.rb
	both modified:   config/routes.rb
	both modified:   config/routes/project.rb
	both modified:   db/schema.rb
	both modified:   doc/api/v3_to_v4.md
	both modified:   lib/api/entities.rb
	both modified:   lib/gitlab/database.rb
	both added:      spec/fixtures/api/schemas/public_api/v3/issues.json
	both added:      spec/fixtures/api/schemas/public_api/v3/merge_requests.json
	both added:      spec/fixtures/api/schemas/public_api/v4/issues.json
	both added:      spec/fixtures/api/schemas/public_api/v4/merge_requests.json
	both modified:   spec/models/project_spec.rb
	both modified:   spec/models/user_spec.rb
	both modified:   spec/services/groups/create_service_spec.rb

Merge request reports