# Conflicts:
#	app/controllers/projects/settings/repository_controller.rb
#	app/services/projects/cleanup_service.rb
#	app/views/projects/mirrors/_mirror_repos.html.haml
#	app/views/projects/settings/repository/show.html.haml
#	config/dependency_decisions.yml
#	config/sidekiq_queues.yml
#	ee/db/migrate/20180823132905_add_packages_enabled_to_project.rb
#	lib/api/search.rb
#	lib/gitlab/import_export/import_export.yml
#	locale/gitlab.pot
#	qa/qa/page/base.rb
#	qa/qa/page/project/settings/mirroring_repositories.rb

[ci skip]