Commit f601aa4d authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '197166-verify-copy-of-expire-docker-tags-with-regex-matching-in-container-registry-expiration-policy' into 'master'

Update copy of Docker expiration policy form

See merge request gitlab-org/gitlab!23763
parents cd84ad52 c68d5ca8
...@@ -174,7 +174,9 @@ export default { ...@@ -174,7 +174,9 @@ export default {
:label-cols="$options.labelsConfig.cols" :label-cols="$options.labelsConfig.cols"
:label-align="$options.labelsConfig.align" :label-align="$options.labelsConfig.align"
label-for="expiration-policy-name-matching" 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" :state="nameRegexState"
:invalid-feedback=" :invalid-feedback="
s__('ContainerRegistry|The value of this input should be less than 255 characters') s__('ContainerRegistry|The value of this input should be less than 255 characters')
......
...@@ -177,7 +177,7 @@ The UI allows you to configure the following: ...@@ -177,7 +177,7 @@ The UI allows you to configure the following:
- **Expiration interval:** how long tags are exempt from being deleted. - **Expiration interval:** how long tags are exempt from being deleted.
- **Expiration schedule:** how often the cron job checking the tags should run. - **Expiration schedule:** how often the cron job checking the tags should run.
- **Expiration latest:** how many tags to _always_ keep for each image. - **Expiration latest:** how many tags to _always_ keep for each image.
- **Expire Docker tags with regex matching:** the regex used to determine what tags should be expired. To qualify all tags for expiration, use the default value of `.*`. - **Docker tags with names matching this regex pattern will expire:** the regex used to determine what tags should be expired. To qualify all tags for expiration, use the default value of `.*`.
## Troubleshooting the GitLab Container Registry ## Troubleshooting the GitLab Container Registry
......
...@@ -5065,6 +5065,9 @@ msgstr "" ...@@ -5065,6 +5065,9 @@ msgstr ""
msgid "ContainerRegistry|Docker tag expiration policy is %{toggleStatus}" msgid "ContainerRegistry|Docker tag expiration policy is %{toggleStatus}"
msgstr "" msgstr ""
msgid "ContainerRegistry|Docker tags with names matching this regex pattern will expire:"
msgstr ""
msgid "ContainerRegistry|Expiration interval:" msgid "ContainerRegistry|Expiration interval:"
msgstr "" msgstr ""
...@@ -5077,9 +5080,6 @@ msgstr "" ...@@ -5077,9 +5080,6 @@ msgstr ""
msgid "ContainerRegistry|Expiration schedule:" msgid "ContainerRegistry|Expiration schedule:"
msgstr "" msgstr ""
msgid "ContainerRegistry|Expire Docker tags that match this regex:"
msgstr ""
msgid "ContainerRegistry|If you are not already logged in, you need to authenticate to the Container Registry by using your GitLab username and password. If you have %{twofaDocLinkStart}Two-Factor Authentication%{twofaDocLinkEnd} enabled, use a %{personalAccessTokensDocLinkStart}Personal Access Token%{personalAccessTokensDocLinkEnd} instead of a password." msgid "ContainerRegistry|If you are not already logged in, you need to authenticate to the Container Registry by using your GitLab username and password. If you have %{twofaDocLinkStart}Two-Factor Authentication%{twofaDocLinkEnd} enabled, use a %{personalAccessTokensDocLinkStart}Personal Access Token%{personalAccessTokensDocLinkEnd} instead of a password."
msgstr "" msgstr ""
......
...@@ -136,7 +136,7 @@ exports[`Settings Form renders 1`] = ` ...@@ -136,7 +136,7 @@ exports[`Settings Form renders 1`] = `
<glformgroup-stub <glformgroup-stub
id="expiration-policy-name-matching-group" id="expiration-policy-name-matching-group"
invalid-feedback="The value of this input should be less than 255 characters" invalid-feedback="The value of this input should be less than 255 characters"
label="Expire Docker tags that match this regex:" label="Docker tags with names matching this regex pattern will expire:"
label-align="right" label-align="right"
label-cols="3" label-cols="3"
label-for="expiration-policy-name-matching" label-for="expiration-policy-name-matching"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment