# Conflicts:
#	app/assets/javascripts/boards/components/board_new_issue.vue
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/boards/stores/boards_store.js
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/ide/components/repo_file.vue
#	app/assets/javascripts/ide/components/repo_tab.vue
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	config/webpack.config.js
#	spec/javascripts/environments/environment_table_spec.js
#	spec/javascripts/repo/components/repo_commit_section_spec.js
#	spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js

[ci skip]