diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/feature_flags/components/feature_flags.vue | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/feature_flags/components/feature_flags.vue')
-rw-r--r-- | app/assets/javascripts/feature_flags/components/feature_flags.vue | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/app/assets/javascripts/feature_flags/components/feature_flags.vue b/app/assets/javascripts/feature_flags/components/feature_flags.vue index ddeefd7b827..348b71dc1c6 100644 --- a/app/assets/javascripts/feature_flags/components/feature_flags.vue +++ b/app/assets/javascripts/feature_flags/components/feature_flags.vue @@ -1,20 +1,19 @@ <script> -import { mapState, mapActions } from 'vuex'; -import { isEmpty } from 'lodash'; import { GlAlert, GlButton, GlModalDirective, GlSprintf, GlTabs } from '@gitlab/ui'; +import { isEmpty } from 'lodash'; +import { mapState, mapActions } from 'vuex'; -import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '../constants'; -import FeatureFlagsTab from './feature_flags_tab.vue'; -import FeatureFlagsTable from './feature_flags_table.vue'; -import UserListsTable from './user_lists_table.vue'; -import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import { buildUrlWithCurrentLocation, getParameterByName, historyPushState, } from '~/lib/utils/common_utils'; - +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; +import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '../constants'; import ConfigureFeatureFlagsModal from './configure_feature_flags_modal.vue'; +import FeatureFlagsTab from './feature_flags_tab.vue'; +import FeatureFlagsTable from './feature_flags_table.vue'; +import UserListsTable from './user_lists_table.vue'; const SCOPES = { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE }; @@ -198,7 +197,7 @@ export default { @token="rotateInstanceId()" /> <div :class="topAreaBaseClasses"> - <div class="gl-display-flex gl-flex-direction-column gl-display-md-none!"> + <div class="gl-display-flex gl-flex-direction-column gl-md-display-none!"> <gl-button v-if="canUserConfigure" v-gl-modal="'configure-feature-flags'" @@ -285,7 +284,7 @@ export default { </feature-flags-tab> <template #tabs-end> <li - class="gl-display-none gl-display-md-flex gl-align-items-center gl-flex-fill-1 gl-justify-content-end" + class="gl-display-none gl-md-display-flex gl-align-items-center gl-flex-fill-1 gl-justify-content-end" > <gl-button v-if="canUserConfigure" |