Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-23 12:09:17 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-23 12:09:17 +0300
commitb3647b2a67930e8aa3c1b1dd9bda29c368c862ba (patch)
treeb5903a88d38e6891bf4b5f7fdcedb5dcb34955b6 /app/assets/javascripts/feature_flags
parentfe6c2b9ae0af6aef067853fb20bef3d72e7978b8 (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/form.vue11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/feature_flags/components/form.vue b/app/assets/javascripts/feature_flags/components/form.vue
index 1f59b709aa2..7e3d3bc5203 100644
--- a/app/assets/javascripts/feature_flags/components/form.vue
+++ b/app/assets/javascripts/feature_flags/components/form.vue
@@ -29,6 +29,9 @@ import EnvironmentsDropdown from './environments_dropdown.vue';
import Strategy from './strategy.vue';
export default {
+ i18n: {
+ statusLabel: s__('FeatureFlags|Status'),
+ },
components: {
GlButton,
GlBadge,
@@ -396,12 +399,14 @@ export default {
<div class="table-section section-20 text-center" role="gridcell">
<div class="table-mobile-header" role="rowheader">
- {{ s__('FeatureFlags|Status') }}
+ {{ $options.i18n.statusLabel }}
</div>
<div class="table-mobile-content gl-display-flex gl-justify-content-center">
<gl-toggle
:value="scope.active"
:disabled="!active || !canUpdateScope(scope)"
+ :label="$options.i18n.statusLabel"
+ label-position="hidden"
@change="(status) => (scope.active = status)"
/>
</div>
@@ -529,11 +534,13 @@ export default {
<div class="table-section section-20 text-center" role="gridcell">
<div class="table-mobile-header" role="rowheader">
- {{ s__('FeatureFlags|Status') }}
+ {{ $options.i18n.statusLabel }}
</div>
<div class="table-mobile-content gl-display-flex gl-justify-content-center">
<gl-toggle
:disabled="!active"
+ :label="$options.i18n.statusLabel"
+ label-position="hidden"
:value="false"
@change="createNewScope({ active: true })"
/>