Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into update-template-name-via-sentence-case

# Conflicts:
#	.gitlab/issue_templates/Feature proposal.md

3 files changed, 94 insertions, 75 deletions

diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
index bbabb98dafe..31c2616d283 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -1,43 +1,66 @@
-.row.prepend-top-default
+.row
   .col-lg-12
     = form_for @project, url: project_settings_ci_cd_path(@project) do |f|
       = form_errors(@project)
-      %fieldset.builds-feature
+      %fieldset.builds-feature.js-auto-devops-settings
         .form-group
           - message = auto_devops_warning_message(@project)
           - ci_file_formatted = '<code>.gitlab-ci.yml</code>'.html_safe
           - if message
-            %p.settings-message.text-center
+            %p.auto-devops-warning-message.settings-message.text-center
               = message.html_safe
           = f.fields_for :auto_devops_attributes, @auto_devops do |form|
-            .form-check
-              = form.radio_button :enabled, 'true', class: 'form-check-input'
-              = form.label :enabled_true, class: 'form-check-label' do
-                %strong= s_('CICD|Enable Auto DevOps')
-                %br
-                = s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted }
+            .card.auto-devops-card
+              .card-body
+                .form-check
+                  = form.radio_button :enabled, 'true', class: 'form-check-input js-toggle-extra-settings'
+                  = form.label :enabled_true, class: 'form-check-label' do
+                    %strong= s_('CICD|Enable Auto DevOps')
+                  .form-text.text-muted
+                    = s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted }
 
-            .form-check
-              = form.radio_button :enabled, 'false', class: 'form-check-input'
-              = form.label :enabled_false, class: 'form-check-label' do
-                %strong= s_('CICD|Disable Auto DevOps')
-                %br
-                = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted }
+            .card.auto-devops-card
+              .card-body
+                .form-check
+                  = form.radio_button :enabled, '', class: 'form-check-input js-toggle-extra-settings'
+                  = form.label :enabled_, class: 'form-check-label' do
+                    %strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" }
+                  .form-text.text-muted
+                    = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted }
 
-            .form-check
-              = form.radio_button :enabled, '', class: 'form-check-input'
-              = form.label :enabled_, class: 'form-check-label' do
-                %strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" }
-                %br
-                = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted }
+            .card.auto-devops-card.js-extra-settings{ class: form.object&.enabled == false ? 'hidden' : nil }
+              .card-body.bg-light
+                = form.label :domain do
+                  %strong= _('Domain')
+                = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
+                .form-text.text-muted
+                  = s_('CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.')
+                  - if cluster_ingress_ip = cluster_ingress_ip(@project)
+                    = s_('%{nip_domain} can be used as an alternative to a custom domain.').html_safe % { nip_domain: "<code>#{cluster_ingress_ip}.nip.io</code>".html_safe }
+                  = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank'
 
-            = form.label :domain, class:"prepend-top-10" do
-              = _('Domain')
-            = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
-            .form-text.text-muted
-              = s_('CICD|A domain is required to use Auto Review Apps and Auto Deploy Stages.')
-              - if cluster_ingress_ip = cluster_ingress_ip(@project)
-                = s_('%{nip_domain} can be used as an alternative to a custom domain.').html_safe % { nip_domain: "<code>#{cluster_ingress_ip}.nip.io</code>".html_safe }
-              = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank'
+                %label.prepend-top-10
+                  %strong= s_('CICD|Deployment strategy')
+                %p.settings-message.text-center
+                  = s_('CICD|Deployment strategy needs a domain name to work correctly.')
+                .form-check
+                  = form.radio_button :deploy_strategy, 'continuous', class: 'form-check-input'
+                  = form.label :deploy_strategy_continuous, class: 'form-check-label' do
+                    %strong= s_('CICD|Continuous deployment to production')
+                    = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-deploy'), target: '_blank'
+                .form-check
+                  = form.radio_button :deploy_strategy, 'manual', class: 'form-check-input'
+                  = form.label :deploy_strategy_manual, class: 'form-check-label' do
+                    %strong= s_('CICD|Automatic deployment to staging, manual deployment to production')
+                    = link_to icon('question-circle'), help_page_path('ci/environments.md', anchor: 'manually-deploying-to-environments'), target: '_blank'
 
-          = f.submit 'Save changes', class: "btn btn-success prepend-top-15"
+            .card.auto-devops-card
+              .card-body
+                .form-check
+                  = form.radio_button :enabled, 'false', class: 'form-check-input js-toggle-extra-settings', data: { hide_extra_settings: true }
+                  = form.label :enabled_false, class: 'form-check-label' do
+                    %strong= s_('CICD|Disable Auto DevOps')
+                  .form-text.text-muted
+                    = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted }
+
+          = f.submit _('Save changes'), class: "btn btn-success prepend-top-15"
diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml
index e93b240a007..5025460a2d0 100644
--- a/app/views/projects/settings/ci_cd/_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_form.html.haml
@@ -4,20 +4,20 @@
       = form_errors(@project)
       %fieldset.builds-feature
         .form-group.append-bottom-default.js-secret-runner-token
-          = f.label :runners_token, "Runner token", class: 'label-light'
+          = f.label :runners_token, _("Runner token"), class: 'label-light'
           .form-control.js-secret-value-placeholder
             = '*' * 20
-          = f.text_field :runners_token, class: "form-control hidden js-secret-value", placeholder: 'xEeFCaDAB89'
-          %p.form-text.text-muted The secure token used by the Runner to checkout the project
+          = f.text_field :runners_token, class: "form-control hide js-secret-value", placeholder: 'xEeFCaDAB89'
+          %p.form-text.text-muted= _("The secure token used by the Runner to checkout the project")
           %button.btn.btn-info.prepend-top-10.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: 'false' } }
             = _('Reveal value')
 
         %hr
         .form-group
           %h5.prepend-top-0
-            Git strategy for pipelines
+            = _("Git strategy for pipelines")
           %p
-            Choose between <code>clone</code> or <code>fetch</code> to get the recent application code
+            = _("Choose between <code>clone</code> or <code>fetch</code> to get the recent application code")
             = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'git-strategy'), target: '_blank'
           .form-check
             = f.radio_button :build_allow_git_fetch, 'false', { class: 'form-check-input' }
@@ -25,29 +25,29 @@
               %strong git clone
               %br
               %span.descr
-                Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job
+                = _("Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job")
           .form-check
             = f.radio_button :build_allow_git_fetch, 'true', { class: 'form-check-input' }
             = f.label :build_allow_git_fetch_true, class: 'form-check-label' do
               %strong git fetch
               %br
               %span.descr
-                Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)
+                = _("Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)")
 
         %hr
         .form-group
-          = f.label :build_timeout_human_readable, 'Timeout', class: 'label-light'
+          = f.label :build_timeout_human_readable, _('Timeout'), class: 'label-light'
           = f.text_field :build_timeout_human_readable, class: 'form-control'
           %p.form-text.text-muted
-            Per job. If a job passes this threshold, it will be marked as failed
+            = _("Per job. If a job passes this threshold, it will be marked as failed")
             = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'timeout'), target: '_blank'
 
         %hr
         .form-group
-          = f.label :ci_config_path, 'Custom CI config path', class: 'label-light'
+          = f.label :ci_config_path, _('Custom CI config path'), class: 'label-light'
           = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml'
           %p.form-text.text-muted
-            The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>
+            = _("The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>")
             = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-config-path'), target: '_blank'
 
         %hr
@@ -55,36 +55,35 @@
           .form-check
             = f.check_box :public_builds, { class: 'form-check-input' }
             = f.label :public_builds, class: 'form-check-label' do
-              %strong Public pipelines
+              %strong= _("Public pipelines")
             .form-text.text-muted
-              Allow public access to pipelines and job details, including output logs and artifacts
+              = _("Allow public access to pipelines and job details, including output logs and artifacts")
               = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines'), target: '_blank'
             .bs-callout.bs-callout-info
-              %p If enabled:
+              %p #{_("If enabled")}:
               %ul
                 %li
-                  For public projects, anyone can view pipelines and access job details (output logs and artifacts)
+                  = _("For public projects, anyone can view pipelines and access job details (output logs and artifacts)")
                 %li
-                  For internal projects, any logged in user can view pipelines and access job details (output logs and artifacts)
+                  = _("For internal projects, any logged in user can view pipelines and access job details (output logs and artifacts)")
                 %li
-                  For private projects, any member (guest or higher) can view pipelines and access job details (output logs and artifacts)
+                  = _("For private projects, any member (guest or higher) can view pipelines and access job details (output logs and artifacts)")
               %p
-                If disabled, the access level will depend on the user's
-                permissions in the project.
+                = _("If disabled, the access level will depend on the user's permissions in the project.")
 
         %hr
         .form-group
           .form-check
             = f.check_box :auto_cancel_pending_pipelines, { class: 'form-check-input' }, 'enabled', 'disabled'
             = f.label :auto_cancel_pending_pipelines, class: 'form-check-label' do
-              %strong Auto-cancel redundant, pending pipelines
+              %strong= _("Auto-cancel redundant, pending pipelines")
             .form-text.text-muted
-              New pipelines will cancel older, pending pipelines on the same branch
+              = _("New pipelines will cancel older, pending pipelines on the same branch")
               = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'auto-cancel-pending-pipelines'), target: '_blank'
 
         %hr
         .form-group
-          = f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light'
+          = f.label :build_coverage_regex, _("Test coverage parsing"), class: 'label-light'
           .input-group
             %span.input-group-prepend
               .input-group-text /
@@ -92,11 +91,10 @@
             %span.input-group-append
               .input-group-text /
           %p.form-text.text-muted
-            A regular expression that will be used to find the test coverage
-            output in the job trace. Leave blank to disable
+            = _("A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable")
             = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'test-coverage-parsing'), target: '_blank'
           .bs-callout.bs-callout-info
-            %p Below are examples of regex for existing tools:
+            %p= _("Below are examples of regex for existing tools:")
             %ul
               %li
                 Simplecov (Ruby) -
@@ -120,7 +118,7 @@
                 JaCoCo (Java/Kotlin)
                 %code Total.*?([0-9]{1,3})%
 
-        = f.submit 'Save changes', class: "btn btn-save"
+        = f.submit _('Save changes'), class: "btn btn-save"
 
 %hr
 
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index ed17bd4f7dc..be22bbd7a9b 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -1,6 +1,6 @@
 - @content_class = "limit-container-width" unless fluid_layout
-- page_title "CI / CD Settings"
-- page_title "CI / CD"
+- page_title _("CI / CD Settings")
+- page_title _("CI / CD")
 
 - expanded = Rails.env.test?
 - general_expanded = @project.errors.empty? ? expanded : true
@@ -8,15 +8,15 @@
 %section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) }
   .settings-header
     %h4
-      General pipelines settings
+      = _("General pipelines")
     %button.btn.js-settings-toggle{ type: 'button' }
-      = expanded ? 'Collapse' : 'Expand'
+      = expanded ? _('Collapse') : _('Expand')
     %p
-      Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report.
+      = _("Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report.")
   .settings-content
     = render 'form'
 
-%section.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-autodevops-settings.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       = s_('CICD|Auto DevOps')
@@ -28,38 +28,36 @@
   .settings-content
     = render 'autodevops_form'
 
-%section.settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-runners-settings.settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Runners settings
+      = _("Runners")
     %button.btn.js-settings-toggle{ type: 'button' }
-      = expanded ? 'Collapse' : 'Expand'
+      = expanded ? _('Collapse') : _('Expand')
     %p
-      Register and see your runners for this project.
+      = _("Register and see your runners for this project.")
   .settings-content
     = render 'projects/runners/index'
 
-%section.settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-variables-settings.settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       = _('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: 'variables'), target: '_blank', rel: 'noopener noreferrer'
     %button.btn.js-settings-toggle{ type: 'button' }
-      = expanded ? 'Collapse' : 'Expand'
+      = expanded ? _('Collapse') : _('Expand')
     %p.append-bottom-0
       = render "ci/variables/content"
   .settings-content
     = render 'ci/variables/index', save_endpoint: project_variables_path(@project)
 
-%section.settings.no-animate{ class: ('expanded' if expanded) }
+%section.settings.no-animate#js-pipeline-triggers{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Pipeline triggers
+      = _("Pipeline triggers")
     %button.btn.js-settings-toggle{ type: 'button' }
-      = expanded ? 'Collapse' : 'Expand'
+      = expanded ? _('Collapse') : _('Expand')
     %p
-      Triggers can force a specific branch or tag to get rebuilt with an API call.  These tokens will
-      impersonate their associated user including their access to projects and their project
-      permissions.
+      = _("Triggers can force a specific branch or tag to get rebuilt with an API call.  These tokens will impersonate their associated user including their access to projects and their project permissions.")
   .settings-content
     = render 'projects/triggers/index'