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/badges | |
| parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/badges')
5 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue index 0beb6bed9ea..20541ad8ccc 100644 --- a/app/assets/javascripts/badges/components/badge_form.vue +++ b/app/assets/javascripts/badges/components/badge_form.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/no-v-html */ +import { GlLoadingIcon, GlFormInput, GlFormGroup, GlButton } from '@gitlab/ui'; import { escape, debounce } from 'lodash'; import { mapActions, mapState } from 'vuex'; -import { GlLoadingIcon, GlFormInput, GlFormGroup, GlButton } from '@gitlab/ui'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { s__, sprintf } from '~/locale'; import createEmptyBadge from '../empty_badge'; diff --git a/app/assets/javascripts/badges/components/badge_list.vue b/app/assets/javascripts/badges/components/badge_list.vue index 811ec6d333b..f16a547e441 100644 --- a/app/assets/javascripts/badges/components/badge_list.vue +++ b/app/assets/javascripts/badges/components/badge_list.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mapState } from 'vuex'; import { GROUP_BADGE } from '../constants'; import BadgeListRow from './badge_list_row.vue'; diff --git a/app/assets/javascripts/badges/components/badge_list_row.vue b/app/assets/javascripts/badges/components/badge_list_row.vue index 4ca91e7a589..fda51c98e2c 100644 --- a/app/assets/javascripts/badges/components/badge_list_row.vue +++ b/app/assets/javascripts/badges/components/badge_list_row.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlLoadingIcon, GlButton, GlModalDirective } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { s__ } from '~/locale'; import { PROJECT_BADGE } from '../constants'; import Badge from './badge.vue'; diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue index 73c63a72b1c..8d5bd216367 100644 --- a/app/assets/javascripts/badges/components/badge_settings.vue +++ b/app/assets/javascripts/badges/components/badge_settings.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlSprintf, GlModal } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { s__ } from '~/locale'; import Badge from './badge.vue'; diff --git a/app/assets/javascripts/badges/store/index.js b/app/assets/javascripts/badges/store/index.js index 7a5df403a0e..848deb2baa7 100644 --- a/app/assets/javascripts/badges/store/index.js +++ b/app/assets/javascripts/badges/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import actions from './actions'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); |