summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/registry/settings
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-27 18:09:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-27 18:09:04 +0000
commit390582e118752426acf5cb25ec99103d312d891c (patch)
treebb0b1a6a46632024ffc3ba1983e4ebcb0fab4428 /app/assets/javascripts/registry/settings
parent1ea1db491c8bc90789acda45c9002aaa5c4dc498 (diff)
downloadgitlab-ce-390582e118752426acf5cb25ec99103d312d891c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/registry/settings')
-rw-r--r--app/assets/javascripts/registry/settings/components/settings_form.vue4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/registry/settings/components/settings_form.vue b/app/assets/javascripts/registry/settings/components/settings_form.vue
index b713cfe2e34..334fde23b74 100644
--- a/app/assets/javascripts/registry/settings/components/settings_form.vue
+++ b/app/assets/javascripts/registry/settings/components/settings_form.vue
@@ -174,7 +174,9 @@ export default {
:label-cols="$options.labelsConfig.cols"
:label-align="$options.labelsConfig.align"
label-for="expiration-policy-name-matching"
- :label="s__('ContainerRegistry|Expire Docker tags that match this regex:')"
+ :label="
+ s__('ContainerRegistry|Docker tags with names matching this regex pattern will expire:')
+ "
:state="nameRegexState"
:invalid-feedback="
s__('ContainerRegistry|The value of this input should be less than 255 characters')