add deploy strategy radio buttons

2 files changed, 15 insertions, 2 deletions

diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 1d850baf012..fb3f6eec2bd 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -41,7 +41,7 @@ module Projects
           :runners_token, :builds_enabled, :build_allow_git_fetch,
           :build_timeout_human_readable, :build_coverage_regex, :public_builds,
           :auto_cancel_pending_pipelines, :ci_config_path,
-          auto_devops_attributes: [:id, :domain, :enabled]
+          auto_devops_attributes: [:id, :domain, :enabled, :deploy_strategy]
         )
       end
 
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 4c25635be6f..037c976f57a 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -38,7 +38,20 @@
                   - 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')
+                .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')
+
             .card
               .card-body
                 .form-check