diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 15:10:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 15:10:17 +0300 |
commit | a39371aad976d8c57224f743ef1aeb465f508695 (patch) | |
tree | 69276be0bdcfcb06b3f8731e67eb0b452f3dc954 /app/assets/javascripts/badges | |
parent | 7866b83bf40c94e8a32d21fdea97a5e142e08f80 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/badges')
-rw-r--r-- | app/assets/javascripts/badges/components/badge_settings.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue index dc107cb44a1..8b22a51ae29 100644 --- a/app/assets/javascripts/badges/components/badge_settings.vue +++ b/app/assets/javascripts/badges/components/badge_settings.vue @@ -1,12 +1,12 @@ <script> import { mapState, mapActions } from 'vuex'; +import { GlSprintf } from '@gitlab/ui'; import createFlash from '~/flash'; import { s__ } from '~/locale'; import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue'; import Badge from './badge.vue'; import BadgeForm from './badge_form.vue'; import BadgeList from './badge_list.vue'; -import { GlSprintf } from '@gitlab/ui'; export default { name: 'BadgeSettings', |