Commit d9f5ff18 authored by Nathan Friend's avatar Nathan Friend

Merge branch 'example_expiration_policy' into 'master'

Update the example regex in the image expiration policy UI

See merge request gitlab-org/gitlab!29348
parents a3714689 cd42b58a
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
<gl-sprintf <gl-sprintf
:message=" :message="
s__( s__(
'ContainerRegistry|Wildcards such as %{codeStart}.*-stable%{codeEnd} or %{codeStart}production/.*%{codeEnd} are supported. To select all tags, use %{codeStart}.*%{codeEnd}', 'ContainerRegistry|Regular expressions such as %{codeStart}.*-test%{codeEnd} or %{codeStart}dev-.*%{codeEnd} are supported. To select all tags, use %{codeStart}.*%{codeEnd}',
) )
" "
> >
......
---
title: Update the example regex in the image expiration policy UI
merge_request: 29348
author:
type: changed
...@@ -511,7 +511,7 @@ then goes through a process of excluding tags from it until only the ones to be ...@@ -511,7 +511,7 @@ then goes through a process of excluding tags from it until only the ones to be
To manage project expiration policy, navigate to **{settings}** **Settings > CI/CD > Container Registry tag expiration policy**. To manage project expiration policy, navigate to **{settings}** **Settings > CI/CD > Container Registry tag expiration policy**.
![Expiration Policy App](img/expiration-policy-app.png) ![Expiration Policy App](img/expiration_policy_app_v13_0.png)
The UI allows you to configure the following: The UI allows you to configure the following:
......
...@@ -5600,6 +5600,9 @@ msgstr "" ...@@ -5600,6 +5600,9 @@ msgstr ""
msgid "ContainerRegistry|Quick Start" msgid "ContainerRegistry|Quick Start"
msgstr "" msgstr ""
msgid "ContainerRegistry|Regular expressions such as %{codeStart}.*-test%{codeEnd} or %{codeStart}dev-.*%{codeEnd} are supported. To select all tags, use %{codeStart}.*%{codeEnd}"
msgstr ""
msgid "ContainerRegistry|Remove repository" msgid "ContainerRegistry|Remove repository"
msgstr "" msgstr ""
...@@ -5686,9 +5689,6 @@ msgstr "" ...@@ -5686,9 +5689,6 @@ msgstr ""
msgid "ContainerRegistry|We are having trouble connecting to Docker, which could be due to an issue with your project name or path. %{docLinkStart}More Information%{docLinkEnd}" msgid "ContainerRegistry|We are having trouble connecting to Docker, which could be due to an issue with your project name or path. %{docLinkStart}More Information%{docLinkEnd}"
msgstr "" msgstr ""
msgid "ContainerRegistry|Wildcards such as %{codeStart}.*-stable%{codeEnd} or %{codeStart}production/.*%{codeEnd} are supported. To select all tags, use %{codeStart}.*%{codeEnd}"
msgstr ""
msgid "ContainerRegistry|With the Container Registry, every project can have its own space to store its Docker images. %{docLinkStart}More Information%{docLinkEnd}" msgid "ContainerRegistry|With the Container Registry, every project can have its own space to store its Docker images. %{docLinkStart}More Information%{docLinkEnd}"
msgstr "" msgstr ""
......
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