# 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/projects/issues/index/index.js
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/controllers/projects/variables_controller.rb
#	app/models/ci/pipeline.rb
#	app/models/ci/runner.rb
#	app/models/group.rb
#	app/serializers/variable_entity.rb
#	app/services/lfs/lock_file_service.rb
#	app/services/lfs/unlock_file_service.rb
#	config/routes/project.rb
#	db/schema.rb
#	doc/administration/job_artifacts.md
#	doc/api/search.md
#	doc/ci/examples/browser_performance.md
#	doc/ci/variables/README.md
#	doc/topics/autodevops/index.md
#	doc/user/group/index.md
#	doc/user/permissions.md
#	doc/user/project/index.md
#	doc/user/project/issue_board.md
#	doc/user/project/issues/index.md
#	doc/user/project/merge_requests/index.md
#	lib/api/search.rb
#	locale/gitlab.pot
#	spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
#	spec/javascripts/fixtures/projects.rb
#	spec/lib/gitlab/import_export/all_models.yml
#	spec/requests/api/search_spec.rb
#	spec/services/lfs/lock_file_service_spec.rb
#	spec/services/lfs/unlock_file_service_spec.rb

[ci skip]