# Conflicts:
#	.gitlab-ci.yml
#	CHANGELOG.md
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/gl_dropdown.js
#	app/assets/javascripts/issuable_form.js
#	app/assets/javascripts/milestone_select.js
#	app/assets/javascripts/users_select.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	app/assets/javascripts/vue_shared/components/ci_badge_link.vue
#	app/assets/stylesheets/pages/issuable.scss
#	app/assets/stylesheets/pages/merge_requests.scss
#	app/controllers/projects/issues_controller.rb
#	app/helpers/diff_helper.rb
#	app/helpers/submodule_helper.rb
#	app/models/blob.rb
#	app/models/group.rb
#	app/models/issue_assignee.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/services/issuable_base_service.rb
#	app/views/admin/health_check/show.html.ham...