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>2019-12-05 15:07:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-05 15:07:43 +0300
commit872319738757edc0483346c75a2407f7019b963f (patch)
treed5953edec6184dda1f53c5994c3ebcebc9e815a2 /app/views/projects/settings
parent8f764d21b0011056e1492d92afe3bd40b847b9f7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/settings')
-rw-r--r--app/views/projects/settings/ci_cd/show.html.haml11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index d2265da26c3..38483f599b7 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -59,3 +59,14 @@
.settings-content
= render 'projects/triggers/index'
+- if Feature.enabled?(:registry_retention_policies_settings, @project)
+ %section.settings.no-animate#js-registry-polcies{ class: ('expanded' if expanded) }
+ .settings-header
+ %h4
+ = _("Container Registry tag expiration policies")
+ %button.btn.js-settings-toggle{ type: 'button' }
+ = expanded ? _('Collapse') : _('Expand')
+ %p
+ = _("Expiration policies for the Container Registry are a perfect solution for keeping the Registry space down while still enjoying the full power of GitLab CI/CD.")
+ .settings-content
+ = render 'projects/registry/settings/index'