diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-01-17 00:13:14 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-02-05 22:09:29 +0300 |
| commit | 3be32027b6c543287b94b5be34bf53039d86f88c (patch) | |
| tree | 6b883f46148f4f6a2f8c127cdefbb205acb2609b /app/views/groups/settings/ci_cd | |
| parent | 79570ce24fa93709db7a7bdd4fae2532a7235486 (diff) | |
Use dynamic variable list in scheduled pipelines and group/project CI secret variables
See https://gitlab.com/gitlab-org/gitlab-ce/issues/39118
Conflicts:
app/views/ci/variables/_form.html.haml
app/views/ci/variables/_table.html.haml
ee/app/views/ci/variables/_environment_scope.html.haml
spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js
spec/javascripts/fixtures/projects.rb
Diffstat (limited to 'app/views/groups/settings/ci_cd')
| -rw-r--r-- | app/views/groups/settings/ci_cd/show.html.haml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml index 472da2a6a72..dd82922ec55 100644 --- a/app/views/groups/settings/ci_cd/show.html.haml +++ b/app/views/groups/settings/ci_cd/show.html.haml @@ -1,4 +1,11 @@ - breadcrumb_title "CI / CD Settings" - page_title "CI / CD" -= render 'ci/variables/index' +%h4 + = _('Secret variables') + = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'secret-variables'), target: '_blank', rel: 'noopener noreferrer' + +%p + = render "ci/variables/content" + += render 'ci/variables/index', save_endpoint: group_variables_path |