# Conflicts:
#	app/assets/javascripts/jobs/components/sidebar_details_block.vue
#	app/workers/all_queues.yml
#	config/sidekiq_queues.yml
#	db/schema.rb
#	doc/administration/high_availability/database.md
#	doc/administration/high_availability/gitlab.md

[ci skip]