# Conflicts:
#	app/controllers/admin/health_check_controller.rb
#	app/models/application_setting.rb
#	db/schema.rb
#	doc/administration/monitoring/prometheus/gitlab_metrics.md
#	doc/api/settings.md
#	locale/gitlab.pot

[ci skip]