diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 09:14:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 09:14:52 +0000 |
| commit | 347bf09d6ecf4871da234c06ca8ee541e27b5105 (patch) | |
| tree | 2ad6943e0c681c22acc8850d1debc6a983b0e006 /app/views/projects/settings/ci_cd/show.html.haml | |
| parent | 0a51be0866d33273070f535257626a9eb2e10700 (diff) | |
| download | gitlab-ce-e6fb969a9e2eb526d0c033422b3e6242fd488574.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc20210223090520
Diffstat (limited to 'app/views/projects/settings/ci_cd/show.html.haml')
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 23 |
1 files changed, 13 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..4ff5ab515ec 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -5,6 +5,8 @@ - expanded = expanded_by_default? - general_expanded = @project.errors.empty? ? expanded : true +- enable_search_settings locals: { container_class: 'gl-my-5' } + %section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded), data: { qa_selector: 'general_pipelines_settings_content' } } .settings-header %h4 @@ -45,16 +47,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 |