CE upstream
Conflicted files. I resolved all of them
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: CHANGELOG.md
both modified: VERSION
both modified: app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
both modified: app/assets/javascripts/merge_request_widget.js.es6
both modified: app/models/ci/runner.rb
both added: app/services/ci/update_build_queue_service.rb
both modified: app/views/shared/web_hooks/_form.html.haml
both modified: config/routes/project.rb
both modified: db/schema.rb
both modified: doc/README.md
both modified: features/steps/shared/paths.rb
both modified: lib/ci/api/builds.rb
both modified: spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
both modified: spec/models/project_spec.rb