diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
commit | 835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch) | |
tree | 07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 83370901cc3..2a53eb8b241 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -1,50 +1,50 @@ <script> -import { isEmpty } from 'lodash'; import { GlSafeHtmlDirective } from '@gitlab/ui'; -import MRWidgetStore from 'ee_else_ce/vue_merge_request_widget/stores/mr_widget_store'; -import MRWidgetService from 'ee_else_ce/vue_merge_request_widget/services/mr_widget_service'; +import { isEmpty } from 'lodash'; import MrWidgetApprovals from 'ee_else_ce/vue_merge_request_widget/components/approvals/approvals.vue'; +import MRWidgetService from 'ee_else_ce/vue_merge_request_widget/services/mr_widget_service'; +import MRWidgetStore from 'ee_else_ce/vue_merge_request_widget/stores/mr_widget_store'; import stateMaps from 'ee_else_ce/vue_merge_request_widget/stores/state_maps'; +import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; +import notify from '~/lib/utils/notify'; import { sprintf, s__, __ } from '~/locale'; import Project from '~/pages/projects/project'; import SmartInterval from '~/smart_interval'; -import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; -import notify from '~/lib/utils/notify'; import { deprecatedCreateFlash as createFlash } from '../flash'; -import GroupedCodequalityReportsApp from '../reports/codequality_report/grouped_codequality_reports_app.vue'; -import GroupedTestReportsApp from '../reports/components/grouped_test_reports_app.vue'; import { setFaviconOverlay } from '../lib/utils/favicon'; import GroupedAccessibilityReportsApp from '../reports/accessibility_report/grouped_accessibility_reports_app.vue'; -import mergeRequestQueryVariablesMixin from './mixins/merge_request_query_variables'; +import GroupedCodequalityReportsApp from '../reports/codequality_report/grouped_codequality_reports_app.vue'; +import GroupedTestReportsApp from '../reports/components/grouped_test_reports_app.vue'; import Loading from './components/loading.vue'; +import MrWidgetAlertMessage from './components/mr_widget_alert_message.vue'; import WidgetHeader from './components/mr_widget_header.vue'; -import WidgetSuggestPipeline from './components/mr_widget_suggest_pipeline.vue'; import WidgetMergeHelp from './components/mr_widget_merge_help.vue'; import MrWidgetPipelineContainer from './components/mr_widget_pipeline_container.vue'; import WidgetRelatedLinks from './components/mr_widget_related_links.vue'; -import MrWidgetAlertMessage from './components/mr_widget_alert_message.vue'; -import MergedState from './components/states/mr_widget_merged.vue'; -import ClosedState from './components/states/mr_widget_closed.vue'; -import MergingState from './components/states/mr_widget_merging.vue'; -import RebaseState from './components/states/mr_widget_rebase.vue'; -import WorkInProgressState from './components/states/work_in_progress.vue'; +import WidgetSuggestPipeline from './components/mr_widget_suggest_pipeline.vue'; +import SourceBranchRemovalStatus from './components/source_branch_removal_status.vue'; import ArchivedState from './components/states/mr_widget_archived.vue'; +import MrWidgetAutoMergeEnabled from './components/states/mr_widget_auto_merge_enabled.vue'; +import AutoMergeFailed from './components/states/mr_widget_auto_merge_failed.vue'; +import CheckingState from './components/states/mr_widget_checking.vue'; +import ClosedState from './components/states/mr_widget_closed.vue'; import ConflictsState from './components/states/mr_widget_conflicts.vue'; -import NothingToMergeState from './components/states/nothing_to_merge.vue'; +import FailedToMerge from './components/states/mr_widget_failed_to_merge.vue'; +import MergedState from './components/states/mr_widget_merged.vue'; +import MergingState from './components/states/mr_widget_merging.vue'; import MissingBranchState from './components/states/mr_widget_missing_branch.vue'; import NotAllowedState from './components/states/mr_widget_not_allowed.vue'; -import ReadyToMergeState from './components/states/ready_to_merge.vue'; -import UnresolvedDiscussionsState from './components/states/unresolved_discussions.vue'; import PipelineBlockedState from './components/states/mr_widget_pipeline_blocked.vue'; +import RebaseState from './components/states/mr_widget_rebase.vue'; +import NothingToMergeState from './components/states/nothing_to_merge.vue'; import PipelineFailedState from './components/states/pipeline_failed.vue'; -import FailedToMerge from './components/states/mr_widget_failed_to_merge.vue'; -import MrWidgetAutoMergeEnabled from './components/states/mr_widget_auto_merge_enabled.vue'; -import AutoMergeFailed from './components/states/mr_widget_auto_merge_failed.vue'; -import CheckingState from './components/states/mr_widget_checking.vue'; +import ReadyToMergeState from './components/states/ready_to_merge.vue'; +import UnresolvedDiscussionsState from './components/states/unresolved_discussions.vue'; +import WorkInProgressState from './components/states/work_in_progress.vue'; // import ExtensionsContainer from './components/extensions/container'; -import eventHub from './event_hub'; -import SourceBranchRemovalStatus from './components/source_branch_removal_status.vue'; import TerraformPlan from './components/terraform/mr_widget_terraform_container.vue'; +import eventHub from './event_hub'; +import mergeRequestQueryVariablesMixin from './mixins/merge_request_query_variables'; import getStateQuery from './queries/get_state.query.graphql'; export default { |