Merge branch '38479-rename-secret-variables-to-variables' into 'master'

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')

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'

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"

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