diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 18:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 18:09:00 +0300 |
| commit | c282dba898a4cb0645f88579339502a4e3778727 (patch) | |
| tree | 94a6457ce4438e085c9ae43bc51a2b5a29787bf2 /app/views/projects | |
| parent | 2c2dd5e36c4ed5f09f488be288882d98f9124d12 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index a65afeecc17..1358077f2b2 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -62,12 +62,12 @@ .settings-content = render 'projects/triggers/index' -- if Feature.enabled?(:registry_retention_policies_settings, @project) +- if settings_container_registry_expiration_policy_available?(@project) %section.settings.no-animate#js-registry-policies{ class: ('expanded' if expanded) } .settings-header %h4 = _("Container Registry tag expiration policy") - = link_to icon('question-circle'), help_page_path('user/packages/container_registry/index', anchor: 'retention-and-expiration-policy'), target: '_blank', rel: 'noopener noreferrer' + = link_to icon('question-circle'), help_page_path('user/packages/container_registry/index', anchor: 'expiration-policy'), target: '_blank', rel: 'noopener noreferrer' %button.btn.js-settings-toggle{ type: 'button' } = expanded ? _('Collapse') : _('Expand') %p diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 8f13806e8cd..17bc10af58a 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -20,6 +20,7 @@ = render "archived_notice", project: @project = render_if_exists "projects/marked_for_deletion_notice", project: @project + = render_if_exists "projects/ancestor_group_marked_for_deletion_notice", project: @project - view_path = @project.default_view |