kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve "Rename "secret variables" to "variables""

Browse source
This commit is contained in:
Fabio Busatto 2018-05-28 16:27:05 +00:00 committed by Kamil Trzciński
parent bb88fb7ea2
commit 7f1b7152f2
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/groups/settings/ci_cd/show.html.haml
View file

@ -6,7 +6,7 @@
%section.settings#secret-variables.no-animate{ class: ('expanded' if expanded) } %section.settings#secret-variables.no-animate{ class: ('expanded' if expanded) }
.settings-header .settings-header
%h4 %h4
= _('Secret variables') = _('Variables')
= link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'secret-variables'), target: '_blank', rel: 'noopener noreferrer' = 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" } %button.btn.btn-default.js-settings-toggle{ type: "button" }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')

2
app/views/projects/settings/ci_cd/show.html.haml
View file

@ -42,7 +42,7 @@
%section.settings.no-animate{ class: ('expanded' if expanded) } %section.settings.no-animate{ class: ('expanded' if expanded) }
.settings-header .settings-header
%h4 %h4
= _('Secret variables') = _('Variables')
= link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'secret-variables'), target: '_blank', rel: 'noopener noreferrer' = 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' } %button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'

2
locale/gitlab.pot
View file

@ -3517,7 +3517,7 @@ msgstr ""
msgid "Seconds to wait for a storage access attempt" msgid "Seconds to wait for a storage access attempt"
msgstr "" msgstr ""
msgid "Secret variables" msgid "Variables"
msgstr "" msgstr ""
msgid "Select Archive Format" msgid "Select Archive Format"

4
qa/qa/page/project/settings/ci_cd.rb
View file

@ -7,7 +7,7 @@ module QA # rubocop:disable Naming/FileName
view 'app/views/projects/settings/ci_cd/show.html.haml' do view 'app/views/projects/settings/ci_cd/show.html.haml' do
element :runners_settings, 'Runners settings' element :runners_settings, 'Runners settings'
element :secret_variables, 'Secret variables' element :secret_variables, 'Variables'
end end
def expand_runners_settings(&block) def expand_runners_settings(&block)
@ -17,7 +17,7 @@ module QA # rubocop:disable Naming/FileName
end end
def expand_secret_variables(&block) def expand_secret_variables(&block)
expand_section('Secret variables') do expand_section('Variables') do
Settings::SecretVariables.perform(&block) Settings::SecretVariables.perform(&block)
end end
end end