diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 21:08:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 21:08:54 +0300 |
| commit | 2f852fc2ebbdbd7c28d182b35fe63025ebbe8274 (patch) | |
| tree | e761438a1ba0c87885d78f944cf5e7332f9aa1a5 /app/assets/javascripts/feature_flags | |
| parent | 6b5e293c6d5c678e78f2a0933d636a33e4723061 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/feature_flags')
3 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/feature_flags/components/form.vue b/app/assets/javascripts/feature_flags/components/form.vue index 3c1944d91bd..3c24fb88895 100644 --- a/app/assets/javascripts/feature_flags/components/form.vue +++ b/app/assets/javascripts/feature_flags/components/form.vue @@ -488,7 +488,9 @@ export default { :target="rolloutPercentageId(index)" > {{ - s__('FeatureFlags|Percent rollout must be a whole number between 0 and 100') + s__( + 'FeatureFlags|Percent rollout must be an integer number between 0 and 100', + ) }} </gl-tooltip> <span class="ml-1">%</span> diff --git a/app/assets/javascripts/feature_flags/components/strategies/flexible_rollout.vue b/app/assets/javascripts/feature_flags/components/strategies/flexible_rollout.vue index 020a0d43096..4daf8b4e6bf 100644 --- a/app/assets/javascripts/feature_flags/components/strategies/flexible_rollout.vue +++ b/app/assets/javascripts/feature_flags/components/strategies/flexible_rollout.vue @@ -17,8 +17,8 @@ export default { }, }, i18n: { - percentageDescription: __('Enter a whole number between 0 and 100'), - percentageInvalid: __('Percent rollout must be a whole number between 0 and 100'), + percentageDescription: __('Enter an integer number number between 0 and 100'), + percentageInvalid: __('Percent rollout must be an integer number between 0 and 100'), percentageLabel: __('Percentage'), stickinessDescription: __('Consistency guarantee method'), stickinessLabel: __('Based on'), diff --git a/app/assets/javascripts/feature_flags/components/strategies/percent_rollout.vue b/app/assets/javascripts/feature_flags/components/strategies/percent_rollout.vue index d262769c891..91e1b85d66e 100644 --- a/app/assets/javascripts/feature_flags/components/strategies/percent_rollout.vue +++ b/app/assets/javascripts/feature_flags/components/strategies/percent_rollout.vue @@ -16,9 +16,9 @@ export default { }, }, i18n: { - rolloutPercentageDescription: __('Enter a whole number between 0 and 100'), + rolloutPercentageDescription: __('Enter an integer number between 0 and 100'), rolloutPercentageInvalid: s__( - 'FeatureFlags|Percent rollout must be a whole number between 0 and 100', + 'FeatureFlags|Percent rollout must be an integer number between 0 and 100', ), rolloutPercentageLabel: s__('FeatureFlag|Percentage'), }, |