# Conflicts:
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/filtered_search/filtered_search_manager.js
#	app/assets/javascripts/pages/groups/issues/index.js
#	app/assets/javascripts/pages/groups/merge_requests/index.js
#	app/assets/javascripts/pages/projects/issues/index/index.js
#	app/assets/javascripts/pages/projects/merge_requests/index/index.js
#	app/controllers/admin/runners_controller.rb
#	app/helpers/sorting_helper.rb
#	app/models/ci/runner.rb
#	app/views/admin/runners/index.html.haml
#	lib/api/runners.rb
#	locale/gitlab.pot
#	spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
#	spec/javascripts/filtered_search/dropdown_user_spec.js
#	spec/javascripts/filtered_search/dropdown_utils_spec.js
#	spec/javascripts/filtered_search/filtered_search_manager_spec.js
#	spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js

[ci skip]