diff options
| author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-12-04 13:50:20 +0100 |
|---|---|---|
| committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-12-04 16:35:04 +0100 |
| commit | ccecf436abdca602e703e09f1017f4376263c1d9 (patch) | |
| tree | 1819679ae14ba6a546c57e45578fcf9aa803a5c5 | |
| parent | 2f8297265855ccb811171a359841f4269189f312 (diff) | |
| download | gitlab-ce-ccecf436abdca602e703e09f1017f4376263c1d9.tar.gz | |
extract common env. variable template to partial
| -rw-r--r-- | app/views/ci/variables/_header.html.haml | 11 | ||||
| -rw-r--r-- | app/views/groups/settings/ci_cd/show.html.haml | 8 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 8 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
4 files changed, 13 insertions, 17 deletions
diff --git a/app/views/ci/variables/_header.html.haml b/app/views/ci/variables/_header.html.haml new file mode 100644 index 00000000000..cb7779e2175 --- /dev/null +++ b/app/views/ci/variables/_header.html.haml @@ -0,0 +1,11 @@ +- expanded = local_assigns.fetch(:expanded) + +%h4 + = _('Environment variables') + = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'variables'), target: '_blank', rel: 'noopener noreferrer' + +%button.btn.btn-default.js-settings-toggle{ type: 'button' } + = expanded ? _('Collapse') : _('Expand') + +%p.append-bottom-0 + = render "ci/variables/content" diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml index a5e6abdba52..d9332e36ef5 100644 --- a/app/views/groups/settings/ci_cd/show.html.haml +++ b/app/views/groups/settings/ci_cd/show.html.haml @@ -5,13 +5,7 @@ %section.settings#ci-variables.no-animate{ class: ('expanded' if expanded) } .settings-header - %h4 - = _('Variables') - = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'variables'), target: '_blank', rel: 'noopener noreferrer' - %button.btn.btn-default.js-settings-toggle{ type: "button" } - = expanded ? _('Collapse') : _('Expand') - %p.append-bottom-0 - = render "ci/variables/content" + = render 'ci/variables/header', expanded: expanded .settings-content = render 'ci/variables/index', save_endpoint: group_variables_path diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index cceb8abcd52..6966bf96724 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -43,13 +43,7 @@ %section.qa-variables-settings.settings.no-animate{ class: ('expanded' if expanded) } .settings-header - %h4 - = _('Environment variables') - = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'variables'), target: '_blank', rel: 'noopener noreferrer' - %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? _('Collapse') : _('Expand') - %p.append-bottom-0 - = render "ci/variables/content" + = render 'ci/variables/header', expanded: expanded .settings-content = render 'ci/variables/index', save_endpoint: project_variables_path(@project) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b05e42a3704..29855c97c7e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7086,9 +7086,6 @@ msgstr "" msgid "Users requesting access to" msgstr "" -msgid "Variables" -msgstr "" - msgid "Various container registry settings." msgstr "" |