# Conflicts:
#	app/assets/javascripts/members.js
#	app/assets/javascripts/project.js
#	app/assets/stylesheets/framework/blank.scss
#	app/assets/stylesheets/framework/mixins.scss
#	app/models/merge_request.rb
#	app/views/dashboard/projects/_zero_authorized_projects.html.haml
#	app/views/shared/milestones/_sidebar.html.haml
#	config/prometheus/additional_metrics.yml
#	spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
#	spec/lib/gitlab/checks/change_access_spec.rb

[ci skip]