diff options
| author | Fabio Busatto <fabio@gitlab.com> | 2018-05-28 16:27:05 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-28 16:27:05 +0000 |
| commit | 7f1b7152f27d4a13c0de129f626b4ad86f06c7b0 (patch) | |
| tree | 93dda07c5893e8ccd99972fbc152dad96fcb91b1 | |
| parent | bb88fb7ea234fc28824c8e5490194271478c4cc6 (diff) | |
| download | gitlab-ce-7f1b7152f27d4a13c0de129f626b4ad86f06c7b0.tar.gz | |
Resolve "Rename "secret variables" to "variables""
| -rw-r--r-- | app/views/groups/settings/ci_cd/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 2 | ||||
| -rw-r--r-- | qa/qa/page/project/settings/ci_cd.rb | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml index 082e1b7befa..383d955d71f 100644 --- a/app/views/groups/settings/ci_cd/show.html.haml +++ b/app/views/groups/settings/ci_cd/show.html.haml @@ -6,7 +6,7 @@ %section.settings#secret-variables.no-animate{ class: ('expanded' if expanded) } .settings-header %h4 - = _('Secret variables') + = _('Variables') = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'secret-variables'), target: '_blank', rel: 'noopener noreferrer' %button.btn.btn-default.js-settings-toggle{ type: "button" } = expanded ? _('Collapse') : _('Expand') diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 7d8dd58e7e0..ed17bd4f7dc 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -42,7 +42,7 @@ %section.settings.no-animate{ class: ('expanded' if expanded) } .settings-header %h4 - = _('Secret variables') + = _('Variables') = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'secret-variables'), target: '_blank', rel: 'noopener noreferrer' %button.btn.js-settings-toggle{ type: 'button' } = expanded ? 'Collapse' : 'Expand' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 608d2a584ba..33122410f21 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3517,7 +3517,7 @@ msgstr "" msgid "Seconds to wait for a storage access attempt" msgstr "" -msgid "Secret variables" +msgid "Variables" msgstr "" msgid "Select Archive Format" diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb index 17a1bc904e4..145c3d3ddfa 100644 --- a/qa/qa/page/project/settings/ci_cd.rb +++ b/qa/qa/page/project/settings/ci_cd.rb @@ -7,7 +7,7 @@ module QA # rubocop:disable Naming/FileName view 'app/views/projects/settings/ci_cd/show.html.haml' do element :runners_settings, 'Runners settings' - element :secret_variables, 'Secret variables' + element :secret_variables, 'Variables' end def expand_runners_settings(&block) @@ -17,7 +17,7 @@ module QA # rubocop:disable Naming/FileName end def expand_secret_variables(&block) - expand_section('Secret variables') do + expand_section('Variables') do Settings::SecretVariables.perform(&block) end end |