CE Upstream - Wednesday
Resolved conflicts:
UU .rubocop_todo.yml
UU app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6
UU app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
UU app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
UU app/controllers/projects/merge_requests_controller.rb
UU app/views/layouts/header/_default.html.haml