# Conflicts:
#	Gemfile.lock
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/vue_shared/components/reports/issues_list.vue
#	app/assets/javascripts/vue_shared/components/reports/report_issues.vue
#	app/helpers/environments_helper.rb
#	lib/gitlab/prometheus/queries/query_additional_metrics.rb
#	locale/gitlab.pot

[ci skip]