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/profile | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/profile')
4 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/profile/account/components/delete_account_modal.vue b/app/assets/javascripts/profile/account/components/delete_account_modal.vue index f06dc72d365..2336cb18cb5 100644 --- a/app/assets/javascripts/profile/account/components/delete_account_modal.vue +++ b/app/assets/javascripts/profile/account/components/delete_account_modal.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/no-v-html */ import { GlModal } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; import csrf from '~/lib/utils/csrf'; +import { __, s__, sprintf } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue index 869fdccc800..c5478aa0226 100644 --- a/app/assets/javascripts/profile/account/components/update_username.vue +++ b/app/assets/javascripts/profile/account/components/update_username.vue @@ -1,9 +1,9 @@ <script> -import { escape } from 'lodash'; import { GlSafeHtmlDirective as SafeHtml, GlButton, GlModal, GlModalDirective } from '@gitlab/ui'; +import { escape } from 'lodash'; +import { deprecatedCreateFlash as Flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { s__, sprintf } from '~/locale'; -import { deprecatedCreateFlash as Flash } from '~/flash'; export default { components: { diff --git a/app/assets/javascripts/profile/account/index.js b/app/assets/javascripts/profile/account/index.js index f6f424db7bd..00fe0bcf89b 100644 --- a/app/assets/javascripts/profile/account/index.js +++ b/app/assets/javascripts/profile/account/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; -import UpdateUsername from './components/update_username.vue'; +import Translate from '~/vue_shared/translate'; import deleteAccountModal from './components/delete_account_modal.vue'; +import UpdateUsername from './components/update_username.vue'; export default () => { Vue.use(Translate); diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js index e6c41c7615c..300dd5ecc51 100644 --- a/app/assets/javascripts/profile/profile.js +++ b/app/assets/javascripts/profile/profile.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import axios from '~/lib/utils/axios_utils'; -import { Rails } from '~/lib/utils/rails_ujs'; import { parseBoolean } from '~/lib/utils/common_utils'; +import { Rails } from '~/lib/utils/rails_ujs'; import TimezoneDropdown, { formatTimezone, } from '~/pages/projects/pipeline_schedules/shared/components/timezone_dropdown'; |