# Conflicts:
#	app/assets/javascripts/boards/components/board_card.vue
#	app/assets/javascripts/clusters/components/application_row.vue
#	app/assets/javascripts/commit/pipelines/pipelines_table.vue
#	app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
#	app/assets/javascripts/cycle_analytics/components/stage_component.vue
#	app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
#	app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
#	app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
#	app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/environments/components/environment_actions.vue
#	app/assets/javascripts/environments/components/environment_external_url.vue
#	app/assets/javascripts/environments/components/environment_item.vue
#	app/assets/javascripts/environments/components/environment_monitoring.vue
#	app/assets/javascripts/environments/components/environment_rollback.vue
#	app/assets/javascripts/environments/components/environment_stop.vue
#	app/assets/javascripts/environments/components/environment_terminal_button.vue
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/environments/folder/environments_folder_view.vue
#	app/assets/javascripts/groups/components/app.vue
#	app/assets/javascripts/groups/components/item_actions.vue
#	app/assets/javascripts/groups/components/item_stats_value.vue
#	app/assets/javascripts/ide/components/ide_project_branches_tree.vue
#	app/assets/javascripts/ide/components/ide_side_bar.vue
#	app/assets/javascripts/ide/components/repo_editor.vue
#	app/assets/javascripts/ide/components/repo_preview.vue
#	app/assets/javascripts/ide/components/repo_tab.vue
#	app/assets/javascripts/issue_show/components/app.vue
#	app/assets/javascripts/monitoring/components/dashboard.vue
#	app/assets/javascripts/monitoring/components/graph.vue
#	app/assets/javascripts/monitoring/components/graph/flag.vue
#	app/assets/javascripts/notebook/cells/markdown.vue
#	app/assets/javascripts/notes/components/comment_form.vue
#	app/assets/javascripts/notes/components/note_attachment.vue
#	app/assets/javascripts/notes/components/note_form.vue
#	app/assets/javascripts/notes/components/noteable_note.vue
#	app/assets/javascripts/pipelines/components/async_button.vue
#	app/assets/javascripts/pipelines/components/graph/action_component.vue
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	app/assets/javascripts/pipelines/components/header_component.vue
#	app/assets/javascripts/pipelines/components/pipelines_table_row.vue
#	app/assets/javascripts/pipelines/components/stage.vue
#	app/assets/javascripts/projects/permissions/components/settings_panel.vue
#	app/assets/javascripts/registry/components/table_registry.vue
#	app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
#	app/assets/javascripts/sidebar/components/lock/edit_form.vue
#	app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
#	app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
#	app/assets/javascripts/vue_shared/components/ci_icon.vue
#	app/assets/javascripts/vue_shared/components/header_ci_component.vue
#	app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
#	app/assets/javascripts/vue_shared/components/loading_button.vue
#	app/assets/javascripts/vue_shared/components/markdown/field.vue
#	app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
#	app/assets/javascripts/vue_shared/components/modal.vue
#	app/assets/javascripts/vue_shared/components/recaptcha_modal.vue
#	app/assets/javascripts/vue_shared/components/table_pagination.vue
#	app/views/layouts/header/_default.html.haml
#	db/schema.rb
#	doc/development/fe_guide/style_guide_js.md
#	doc/topics/git/index.md
#	doc/user/project/clusters/index.md
#	features/support/env.rb
#	qa/qa/page/menu/admin.rb
#	qa/qa/scenario/test/sanity/selectors.rb
#	yarn.lock

[ci skip]