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/operation_settings | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/operation_settings')
6 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/operation_settings/components/form_group/dashboard_timezone.vue b/app/assets/javascripts/operation_settings/components/form_group/dashboard_timezone.vue index d83146d2f5e..7120ad511d3 100644 --- a/app/assets/javascripts/operation_settings/components/form_group/dashboard_timezone.vue +++ b/app/assets/javascripts/operation_settings/components/form_group/dashboard_timezone.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlFormGroup, GlFormSelect } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { s__ } from '~/locale'; import { timezones } from '~/monitoring/format_date'; diff --git a/app/assets/javascripts/operation_settings/components/form_group/external_dashboard.vue b/app/assets/javascripts/operation_settings/components/form_group/external_dashboard.vue index 812c5a3fe9a..2ea5b4e01b1 100644 --- a/app/assets/javascripts/operation_settings/components/form_group/external_dashboard.vue +++ b/app/assets/javascripts/operation_settings/components/form_group/external_dashboard.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/operation_settings/components/metrics_settings.vue b/app/assets/javascripts/operation_settings/components/metrics_settings.vue index 2d2e625d3d3..0c0bbb744b3 100644 --- a/app/assets/javascripts/operation_settings/components/metrics_settings.vue +++ b/app/assets/javascripts/operation_settings/components/metrics_settings.vue @@ -1,8 +1,8 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlButton, GlLink } from '@gitlab/ui'; -import ExternalDashboard from './form_group/external_dashboard.vue'; +import { mapState, mapActions } from 'vuex'; import DashboardTimezone from './form_group/dashboard_timezone.vue'; +import ExternalDashboard from './form_group/external_dashboard.vue'; export default { components: { diff --git a/app/assets/javascripts/operation_settings/index.js b/app/assets/javascripts/operation_settings/index.js index 426a060949e..faddf9c7b81 100644 --- a/app/assets/javascripts/operation_settings/index.js +++ b/app/assets/javascripts/operation_settings/index.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import store from './store'; import MetricsSettingsForm from './components/metrics_settings.vue'; +import store from './store'; export default () => { const el = document.querySelector('.js-operation-settings'); diff --git a/app/assets/javascripts/operation_settings/store/actions.js b/app/assets/javascripts/operation_settings/store/actions.js index bbbff6630d3..af66e344b35 100644 --- a/app/assets/javascripts/operation_settings/store/actions.js +++ b/app/assets/javascripts/operation_settings/store/actions.js @@ -1,7 +1,7 @@ -import axios from '~/lib/utils/axios_utils'; -import { __ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; import * as mutationTypes from './mutation_types'; export const setExternalDashboardUrl = ({ commit }, url) => diff --git a/app/assets/javascripts/operation_settings/store/index.js b/app/assets/javascripts/operation_settings/store/index.js index e3dcfd31a83..a11bd8089fd 100644 --- a/app/assets/javascripts/operation_settings/store/index.js +++ b/app/assets/javascripts/operation_settings/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); |