diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 15:07:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 15:07:35 +0300 |
| commit | e3764d340e2849fccee8c06278d1f5f686edd35b (patch) | |
| tree | 23de7fe0eaa58a82c3a72eb8ff4a195e24627eb7 /app/views/projects | |
| parent | e3d67bcff7b8bc6a453d0814d404a9a61d97bc0f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/registry/settings/_index.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/registry/settings/_index.haml b/app/views/projects/registry/settings/_index.haml index e1eed93664e..d023a083445 100644 --- a/app/views/projects/registry/settings/_index.haml +++ b/app/views/projects/registry/settings/_index.haml @@ -1,2 +1 @@ -#js-registry-settings{ data: { registry_settings_endpoint: '', - help_page_path: help_page_path('user/project/operations/linking_to_an_external_dashboard') } } +#js-registry-settings{ data: { project_id: @project.id, } } diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 38483f599b7..9e7652fe663 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -63,10 +63,11 @@ %section.settings.no-animate#js-registry-polcies{ class: ('expanded' if expanded) } .settings-header %h4 - = _("Container Registry tag expiration policies") + = _("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' %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.") + = _("Expiration policy for the Container Registry is 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' |