diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-07 12:23:36 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-07 12:23:36 +0000 |
| commit | a55cfc1e6316232e25a46416b0a60be7c1282da7 (patch) | |
| tree | 26ea2ed9e04c2110e718441577aec2489ea76642 /app/views/groups | |
| parent | 024c8a427eaf3267daf92359dcb9668f28fa8384 (diff) | |
| parent | efcdc269e03836e78dcc8d460621c948ac02bc24 (diff) | |
| download | gitlab-ce-a55cfc1e6316232e25a46416b0a60be7c1282da7.tar.gz | |
Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'
Dynamic CI secret variables -- CE backport
See merge request gitlab-org/gitlab-ce!16842
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/settings/ci_cd/show.html.haml | 9 | ||||
| -rw-r--r-- | app/views/groups/variables/show.html.haml | 1 |
2 files changed, 8 insertions, 2 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 diff --git a/app/views/groups/variables/show.html.haml b/app/views/groups/variables/show.html.haml deleted file mode 100644 index df533952b76..00000000000 --- a/app/views/groups/variables/show.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render 'ci/variables/show' |