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/admin | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/admin')
6 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/admin/statistics_panel/components/app.vue b/app/assets/javascripts/admin/statistics_panel/components/app.vue index 7e1bb3ed0ce..1f0db422807 100644 --- a/app/assets/javascripts/admin/statistics_panel/components/app.vue +++ b/app/assets/javascripts/admin/statistics_panel/components/app.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapGetters, mapActions } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mapState, mapGetters, mapActions } from 'vuex'; import statisticsLabels from '../constants'; export default { diff --git a/app/assets/javascripts/admin/statistics_panel/store/actions.js b/app/assets/javascripts/admin/statistics_panel/store/actions.js index 149540c4222..459f11c02f1 100644 --- a/app/assets/javascripts/admin/statistics_panel/store/actions.js +++ b/app/assets/javascripts/admin/statistics_panel/store/actions.js @@ -1,7 +1,7 @@ import Api from '~/api'; -import { s__ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import * as types from './mutation_types'; export const requestStatistics = ({ commit }) => commit(types.REQUEST_STATISTICS); diff --git a/app/assets/javascripts/admin/users/components/actions/index.js b/app/assets/javascripts/admin/users/components/actions/index.js index 697bf284453..e34b01346b9 100644 --- a/app/assets/javascripts/admin/users/components/actions/index.js +++ b/app/assets/javascripts/admin/users/components/actions/index.js @@ -4,9 +4,9 @@ import Block from './block.vue'; import Deactivate from './deactivate.vue'; import Delete from './delete.vue'; import DeleteWithContributions from './delete_with_contributions.vue'; +import Reject from './reject.vue'; import Unblock from './unblock.vue'; import Unlock from './unlock.vue'; -import Reject from './reject.vue'; export default { Activate, diff --git a/app/assets/javascripts/admin/users/components/user_actions.vue b/app/assets/javascripts/admin/users/components/user_actions.vue index f6d2f6b7497..e92c97b54a3 100644 --- a/app/assets/javascripts/admin/users/components/user_actions.vue +++ b/app/assets/javascripts/admin/users/components/user_actions.vue @@ -6,10 +6,10 @@ import { GlDropdownSectionHeader, GlDropdownDivider, } from '@gitlab/ui'; -import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { convertArrayToCamelCase } from '~/lib/utils/common_utils'; -import { generateUserPaths } from '../utils'; +import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { I18N_USER_ACTIONS } from '../constants'; +import { generateUserPaths } from '../utils'; import Actions from './actions'; export default { diff --git a/app/assets/javascripts/admin/users/components/users_table.vue b/app/assets/javascripts/admin/users/components/users_table.vue index 0eefe1070ff..8962068601c 100644 --- a/app/assets/javascripts/admin/users/components/users_table.vue +++ b/app/assets/javascripts/admin/users/components/users_table.vue @@ -1,8 +1,8 @@ <script> import { GlTable } from '@gitlab/ui'; import { __ } from '~/locale'; -import UserAvatar from './user_avatar.vue'; import UserActions from './user_actions.vue'; +import UserAvatar from './user_avatar.vue'; import UserDate from './user_date.vue'; const DEFAULT_TH_CLASSES = diff --git a/app/assets/javascripts/admin/users/index.js b/app/assets/javascripts/admin/users/index.js index 00a84259c22..0365d054fc9 100644 --- a/app/assets/javascripts/admin/users/index.js +++ b/app/assets/javascripts/admin/users/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import UsagePingDisabled from './components/usage_ping_disabled.vue'; import AdminUsersApp from './components/app.vue'; +import UsagePingDisabled from './components/usage_ping_disabled.vue'; export const initAdminUsersApp = (el = document.querySelector('#js-admin-users-app')) => { if (!el) { |