diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 21:42:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 21:42:02 +0300 |
commit | 5a1541a44f745cf9ae4121d6919a1530a7212afe (patch) | |
tree | 3841ea24d9eaa1e5521f168348af3fd409aab962 /app/views/projects/settings | |
parent | f1bc6c9f752e5dcf11f5798c70498e9ae4a8e3ec (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-ee
Diffstat (limited to 'app/views/projects/settings')
-rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index ee49377595b..51abb8ed791 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -45,16 +45,17 @@ .settings-content = render 'projects/runners/index' -%section.settings.no-animate#js-artifacts-settings{ class: ('expanded' if expanded) } - .settings-header - %h4 - = _("Artifacts") - %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } - = expanded ? _('Collapse') : _('Expand') - %p - = _("A job artifact is an archive of files and directories saved by a job when it finishes.") - .settings-content - #js-artifacts-settings-app{ data: { full_path: @project.full_path, help_page_path: help_page_path('ci/pipelines/job_artifacts', anchor: 'keep-artifacts-from-most-recent-successful-jobs') } } +- if Gitlab::CurrentSettings.current_application_settings.keep_latest_artifact? + %section.settings.no-animate#js-artifacts-settings{ class: ('expanded' if expanded) } + .settings-header + %h4 + = _("Artifacts") + %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } + = expanded ? _('Collapse') : _('Expand') + %p + = _("A job artifact is an archive of files and directories saved by a job when it finishes.") + .settings-content + #js-artifacts-settings-app{ data: { full_path: @project.full_path, help_page_path: help_page_path('ci/pipelines/job_artifacts', anchor: 'keep-artifacts-from-most-recent-successful-jobs') } } %section.qa-variables-settings.settings.no-animate#js-cicd-variables-settings{ class: ('expanded' if expanded), data: { qa_selector: 'variables_settings_content' } } .settings-header |