diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-21 18:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-21 18:08:36 +0300 |
commit | 81884c35b86035f89364db482e4fff91718bb63a (patch) | |
tree | 49090a57dd0e6e49390f593bf24ee49dd8fb7b7f /app/assets/javascripts/feature_flags | |
parent | 6f3692902c2e5dc690593b8c44f77b86b5c28904 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/feature_flags')
-rw-r--r-- | app/assets/javascripts/feature_flags/components/feature_flags_tab.vue | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/app/assets/javascripts/feature_flags/components/feature_flags_tab.vue b/app/assets/javascripts/feature_flags/components/feature_flags_tab.vue index 24b0b54d1be..d0df00e446b 100644 --- a/app/assets/javascripts/feature_flags/components/feature_flags_tab.vue +++ b/app/assets/javascripts/feature_flags/components/feature_flags_tab.vue @@ -68,41 +68,39 @@ export default { <span data-testid="feature-flags-tab-title">{{ title }}</span> <gl-badge size="sm" class="gl-tab-counter-badge">{{ itemCount }}</gl-badge> </template> - <template> - <gl-alert - v-for="(message, index) in alerts" - :key="index" - data-testid="serverErrors" - variant="danger" - @dismiss="clearAlert(index)" - > - {{ message }} - </gl-alert> + <gl-alert + v-for="(message, index) in alerts" + :key="index" + data-testid="serverErrors" + variant="danger" + @dismiss="clearAlert(index)" + > + {{ message }} + </gl-alert> - <gl-loading-icon v-if="isLoading" :label="loadingLabel" size="md" class="gl-mt-4" /> + <gl-loading-icon v-if="isLoading" :label="loadingLabel" size="md" class="gl-mt-4" /> - <gl-empty-state - v-else-if="errorState" - :title="errorTitle" - :description="s__(`FeatureFlags|Try again in a few moments or contact your support team.`)" - :svg-path="errorStateSvgPath" - data-testid="error-state" - /> + <gl-empty-state + v-else-if="errorState" + :title="errorTitle" + :description="s__(`FeatureFlags|Try again in a few moments or contact your support team.`)" + :svg-path="errorStateSvgPath" + data-testid="error-state" + /> - <gl-empty-state - v-else-if="emptyState" - :title="emptyTitle" - :svg-path="errorStateSvgPath" - data-testid="empty-state" - > - <template #description> - {{ emptyDescription }} - <gl-link :href="featureFlagsHelpPagePath" target="_blank"> - {{ s__('FeatureFlags|More information') }} - </gl-link> - </template> - </gl-empty-state> - <slot> </slot> - </template> + <gl-empty-state + v-else-if="emptyState" + :title="emptyTitle" + :svg-path="errorStateSvgPath" + data-testid="empty-state" + > + <template #description> + {{ emptyDescription }} + <gl-link :href="featureFlagsHelpPagePath" target="_blank"> + {{ s__('FeatureFlags|More information') }} + </gl-link> + </template> + </gl-empty-state> + <slot> </slot> </gl-tab> </template> |