# Conflicts:
#	app/models/ci/build.rb
#	app/workers/all_queues.yml
#	config/sidekiq_queues.yml
#	db/schema.rb
#	locale/gitlab.pot
#	spec/lib/gitlab/import_export/all_models.yml

[ci skip]