Merge branch...

Merge branch '40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settings' into 'master'

Resolve "Remove the checkbox for starting a new pipeline in Auto DevOps settings"

Closes #40761

See merge request gitlab-org/gitlab-ce!15714

app/assets/javascripts/dispatcher.js

@@ -525,13 +525,6 @@ import ProjectVariables from './project_variables';
         case 'projects:settings:ci_cd:show':
           // Initialize expandable settings panels
           initSettingsPanels();
-
-          import(/* webpackChunkName: "ci-cd-settings" */ './projects/ci_cd_settings_bundle')
-            .then(ciCdSettings => ciCdSettings.default())
-            .catch((err) => {
-              Flash(s__('ProjectSettings|Problem setting up the CI/CD settings JavaScript'));
-              throw err;
-            });
         case 'groups:settings:ci_cd:show':
           new ProjectVariables();
           break;

app/assets/javascripts/projects/ci_cd_settings_bundle.js

-function updateAutoDevopsRadios(radioWrappers) {
-  radioWrappers.forEach((radioWrapper) => {
-    const radio = radioWrapper.querySelector('.js-auto-devops-enable-radio');
-    const runPipelineCheckboxWrapper = radioWrapper.querySelector('.js-run-auto-devops-pipeline-checkbox-wrapper');
-    const runPipelineCheckbox = radioWrapper.querySelector('.js-run-auto-devops-pipeline-checkbox');
-
-    if (runPipelineCheckbox) {
-      runPipelineCheckbox.checked = radio.checked;
-      runPipelineCheckboxWrapper.classList.toggle('hide', !radio.checked);
-    }
-  });
-}
-
-export default function initCiCdSettings() {
-  const radioWrappers = document.querySelectorAll('.js-auto-devops-enable-radio-wrapper');
-  radioWrappers.forEach(radioWrapper =>
-    radioWrapper.addEventListener('change', () => updateAutoDevopsRadios(radioWrappers)),
-  );
-}

app/controllers/projects/pipelines_settings_controller.rb

@@ -29,7 +29,6 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
       :runners_token, :builds_enabled, :build_allow_git_fetch,
       :build_timeout_in_minutes, :build_coverage_regex, :public_builds,
       :auto_cancel_pending_pipelines, :ci_config_path,
-      :run_auto_devops_pipeline_implicit, :run_auto_devops_pipeline_explicit,
       auto_devops_attributes: [:id, :domain, :enabled]
     )
   end

app/helpers/auto_devops_helper.rb

@@ -8,22 +8,6 @@ module AutoDevopsHelper
       !project.ci_service
   end
 
-  def show_run_auto_devops_pipeline_checkbox_for_instance_setting?(project)
-    return false if project.repository.gitlab_ci_yml
-
-    if project&.auto_devops&.enabled.present?
-      !project.auto_devops.enabled && current_application_settings.auto_devops_enabled?
-    else
-      current_application_settings.auto_devops_enabled?
-    end
-  end
-
-  def show_run_auto_devops_pipeline_checkbox_for_explicit_setting?(project)
-    return false if project.repository.gitlab_ci_yml
-
-    !project.auto_devops_enabled?
-  end
-
   def auto_devops_warning_message(project)
     missing_domain = !project.auto_devops&.has_domain?
     missing_service = !project.deployment_platform&.active?

app/services/projects/update_service.rb

@@ -15,7 +15,7 @@ module Projects
         return error("Could not set the default branch") unless project.change_head(params[:default_branch])
       end
 
-      if project.update_attributes(update_params)
+      if project.update_attributes(params.except(:default_branch))
         if project.previous_changes.include?('path')
           project.rename_repo
         else
@@ -32,15 +32,13 @@ module Projects
     end
 
     def run_auto_devops_pipeline?
-      params.dig(:run_auto_devops_pipeline_explicit) == 'true' || params.dig(:run_auto_devops_pipeline_implicit) == 'true'
+      return false if project.repository.gitlab_ci_yml || !project.auto_devops.previous_changes.include?('enabled')
+
+      project.auto_devops.enabled? || (project.auto_devops.enabled.nil? && current_application_settings.auto_devops_enabled?)
     end
 
     private
 
-    def update_params
-      params.except(:default_branch, :run_auto_devops_pipeline_explicit, :run_auto_devops_pipeline_implicit)
-    end
-
     def renaming_project_with_container_registry_tags?
       new_path = params[:path]
 

app/views/projects/pipelines_settings/_show.html.haml

@@ -6,46 +6,35 @@
           %h5 Auto DevOps (Beta)
           %p
             Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.
-            This will happen starting with the next event (e.g.: push) that occurs to the project.
             = link_to 'Learn more about Auto DevOps', help_page_path('topics/autodevops/index.md')
             - message = auto_devops_warning_message(@project)
             - if message
               %p.settings-message.text-center
                 = message.html_safe
           = f.fields_for :auto_devops_attributes, @auto_devops do |form|
-            .radio.js-auto-devops-enable-radio-wrapper
+            .radio
               = form.label :enabled_true do
-                = form.radio_button :enabled, 'true', class: 'js-auto-devops-enable-radio'
+                = form.radio_button :enabled, 'true'
                 %strong Enable Auto DevOps
                 %br
                 %span.descr
                   The Auto DevOps pipeline configuration will be used when there is no <code>.gitlab-ci.yml</code> in the project.
-                - if show_run_auto_devops_pipeline_checkbox_for_explicit_setting?(@project)
-                  .checkbox.hide.js-run-auto-devops-pipeline-checkbox-wrapper
-                    = label_tag 'project[run_auto_devops_pipeline_explicit]' do
-                      = check_box_tag 'project[run_auto_devops_pipeline_explicit]', true, false, class: 'js-run-auto-devops-pipeline-checkbox'
-                      = s_('ProjectSettings|Immediately run a pipeline on the default branch')
 
-            .radio.js-auto-devops-enable-radio-wrapper
+            .radio
               = form.label :enabled_false do
-                = form.radio_button :enabled, 'false', class: 'js-auto-devops-enable-radio'
+                = form.radio_button :enabled, 'false'
                 %strong Disable Auto DevOps
                 %br
                 %span.descr
                   An explicit <code>.gitlab-ci.yml</code> needs to be specified before you can begin using Continuous Integration and Delivery.
 
-            .radio.js-auto-devops-enable-radio-wrapper
+            .radio
               = form.label :enabled_ do
-                = form.radio_button :enabled, '', class: 'js-auto-devops-enable-radio'
+                = form.radio_button :enabled, ''
                 %strong Instance default (#{current_application_settings.auto_devops_enabled? ? 'enabled' : 'disabled'})
                 %br
                 %span.descr
                   Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific <code>.gitlab-ci.yml</code>.
-                - if show_run_auto_devops_pipeline_checkbox_for_instance_setting?(@project)
-                  .checkbox.hide.js-run-auto-devops-pipeline-checkbox-wrapper
-                    = label_tag 'project[run_auto_devops_pipeline_implicit]' do
-                      = check_box_tag 'project[run_auto_devops_pipeline_implicit]', true, false, class: 'js-run-auto-devops-pipeline-checkbox'
-                      = s_('ProjectSettings|Immediately run a pipeline on the default branch')
             %p
               You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.
             = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'

doc/topics/autodevops/index.md

@@ -129,8 +129,6 @@ full use of Auto DevOps. If this is your fist time, we recommend you follow the
 1. Go to your project's **Settings > CI/CD > General pipelines settings** and
    find the Auto DevOps section
 1. Select "Enable Auto DevOps"
-1. After selecting an option to enable Auto DevOps, a checkbox will appear below
-   so you can immediately run a pipeline on the default branch
 1. Optionally, but recommended, add in the [base domain](#auto-devops-base-domain)
    that will be used by Kubernetes to deploy your application
 1. Hit **Save changes** for the changes to take effect

spec/controllers/projects/pipelines_settings_controller_spec.rb

@@ -16,14 +16,13 @@ describe Projects::PipelinesSettingsController do
       patch :update,
         namespace_id: project.namespace.to_param,
         project_id: project,
-        project: { auto_devops_attributes: params,
-                   run_auto_devops_pipeline_implicit: 'false',
-                   run_auto_devops_pipeline_explicit: auto_devops_pipeline }
+        project: {
+          auto_devops_attributes: params
+        }
     end
 
     context 'when updating the auto_devops settings' do
       let(:params) { { enabled: '', domain: 'mepmep.md' } }
-      let(:auto_devops_pipeline) { 'false' }
 
       it 'redirects to the settings page' do
         subject
@@ -44,7 +43,9 @@ describe Projects::PipelinesSettingsController do
       end
 
       context 'when run_auto_devops_pipeline is true' do
-        let(:auto_devops_pipeline) { 'true' }
+        before do
+          expect_any_instance_of(Projects::UpdateService).to receive(:run_auto_devops_pipeline?).and_return(true)
+        end
 
         it 'queues a CreatePipelineWorker' do
           expect(CreatePipelineWorker).to receive(:perform_async).with(project.id, user.id, project.default_branch, :web, any_args)
@@ -54,7 +55,9 @@ describe Projects::PipelinesSettingsController do
       end
 
       context 'when run_auto_devops_pipeline is not true' do
-        let(:auto_devops_pipeline) { 'false' }
+        before do
+          expect_any_instance_of(Projects::UpdateService).to receive(:run_auto_devops_pipeline?).and_return(false)
+        end
 
         it 'does not queue a CreatePipelineWorker' do
           expect(CreatePipelineWorker).not_to receive(:perform_async).with(project.id, user.id, :web, any_args)

spec/features/projects/settings/pipelines_settings_spec.rb

@@ -59,107 +59,6 @@ feature "Pipelines settings" do
         expect(project.auto_devops).to be_present
         expect(project.auto_devops).not_to be_enabled
       end
-
-      describe 'Immediately run pipeline checkbox option', :js do
-        context 'when auto devops is set to instance default (enabled)' do
-          before do
-            stub_application_setting(auto_devops_enabled: true)
-            project.create_auto_devops!(enabled: nil)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not show checkboxes on page-load' do
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-
-          it 'selecting explicit disabled hides all checkboxes' do
-            page.choose('project_auto_devops_attributes_enabled_false')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-
-          it 'selecting explicit enabled hides all checkboxes because we are already enabled' do
-            page.choose('project_auto_devops_attributes_enabled_true')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-        end
-
-        context 'when auto devops is set to instance default (disabled)' do
-          before do
-            stub_application_setting(auto_devops_enabled: false)
-            project.create_auto_devops!(enabled: nil)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not show checkboxes on page-load' do
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-
-          it 'selecting explicit disabled hides all checkboxes' do
-            page.choose('project_auto_devops_attributes_enabled_false')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-
-          it 'selecting explicit enabled shows a checkbox' do
-            page.choose('project_auto_devops_attributes_enabled_true')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper:not(.hide)', count: 1)
-          end
-        end
-
-        context 'when auto devops is set to explicit disabled' do
-          before do
-            stub_application_setting(auto_devops_enabled: true)
-            project.create_auto_devops!(enabled: false)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not show checkboxes on page-load' do
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 2, visible: false)
-          end
-
-          it 'selecting explicit enabled shows a checkbox' do
-            page.choose('project_auto_devops_attributes_enabled_true')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper:not(.hide)', count: 1)
-          end
-
-          it 'selecting instance default (enabled) shows a checkbox' do
-            page.choose('project_auto_devops_attributes_enabled_')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper:not(.hide)', count: 1)
-          end
-        end
-
-        context 'when auto devops is set to explicit enabled' do
-          before do
-            stub_application_setting(auto_devops_enabled: false)
-            project.create_auto_devops!(enabled: true)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not have any checkboxes' do
-            expect(page).not_to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper', visible: false)
-          end
-        end
-
-        context 'when master contains a .gitlab-ci.yml file' do
-          let(:project) { create(:project, :repository) }
-
-          before do
-            project.repository.create_file(user, '.gitlab-ci.yml', "script: ['test']", message: 'test', branch_name: project.default_branch)
-            stub_application_setting(auto_devops_enabled: true)
-            project.create_auto_devops!(enabled: false)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not have any checkboxes' do
-            expect(page).not_to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper', visible: false)
-          end
-        end
-      end
     end
   end
 end

spec/helpers/auto_devops_helper_spec.rb

@@ -82,104 +82,4 @@ describe AutoDevopsHelper do
       it { is_expected.to eq(false) }
     end
   end
-
-  describe '.show_run_auto_devops_pipeline_checkbox_for_instance_setting?' do
-    subject { helper.show_run_auto_devops_pipeline_checkbox_for_instance_setting?(project) }
-
-    context 'when master contains a .gitlab-ci.yml file' do
-      before do
-        allow(project.repository).to receive(:gitlab_ci_yml).and_return("script: ['test']")
-      end
-
-      it { is_expected.to eq(false) }
-    end
-
-    context 'when auto devops is explicitly enabled' do
-      before do
-        project.create_auto_devops!(enabled: true)
-      end
-
-      it { is_expected.to eq(false) }
-    end
-
-    context 'when auto devops is explicitly disabled' do
-      before do
-        project.create_auto_devops!(enabled: false)
-      end
-
-      context 'when auto devops is enabled system-wide' do
-        before do
-          stub_application_setting(auto_devops_enabled: true)
-        end
-
-        it { is_expected.to eq(true) }
-      end
-
-      context 'when auto devops is disabled system-wide' do
-        before do
-          stub_application_setting(auto_devops_enabled: false)
-        end
-
-        it { is_expected.to eq(false) }
-      end
-    end
-
-    context 'when auto devops is set to instance setting' do
-      before do
-        project.create_auto_devops!(enabled: nil)
-      end
-
-      it { is_expected.to eq(false) }
-    end
-  end
-
-  describe '.show_run_auto_devops_pipeline_checkbox_for_explicit_setting?' do
-    subject { helper.show_run_auto_devops_pipeline_checkbox_for_explicit_setting?(project) }
-
-    context 'when master contains a .gitlab-ci.yml file' do
-      before do
-        allow(project.repository).to receive(:gitlab_ci_yml).and_return("script: ['test']")
-      end
-
-      it { is_expected.to eq(false) }
-    end
-
-    context 'when auto devops is explicitly enabled' do
-      before do
-        project.create_auto_devops!(enabled: true)
-      end
-
-      it { is_expected.to eq(false) }
-    end
-
-    context 'when auto devops is explicitly disabled' do
-      before do
-        project.create_auto_devops!(enabled: false)
-      end
-
-      it { is_expected.to eq(true) }
-    end
-
-    context 'when auto devops is set to instance setting' do
-      before do
-        project.create_auto_devops!(enabled: nil)
-      end
-
-      context 'when auto devops is enabled system-wide' do
-        before do
-          stub_application_setting(auto_devops_enabled: true)
-        end
-
-        it { is_expected.to eq(false) }
-      end
-
-      context 'when auto devops is disabled system-wide' do
-        before do
-          stub_application_setting(auto_devops_enabled: false)
-        end
-
-        it { is_expected.to eq(true) }
-      end
-    end
-  end
 end

spec/services/projects/update_service_spec.rb

@@ -199,24 +199,53 @@ describe Projects::UpdateService do
   end
 
   describe '#run_auto_devops_pipeline?' do
-    subject { described_class.new(project, user, params).run_auto_devops_pipeline? }
+    subject { described_class.new(project, user).run_auto_devops_pipeline? }
 
-    context 'when neither pipeline setting is true' do
-      let(:params) { {} }
+    context 'when master contains a .gitlab-ci.yml file' do
+      before do
+        allow(project.repository).to receive(:gitlab_ci_yml).and_return("script: ['test']")
+      end
 
       it { is_expected.to eq(false) }
     end
 
-    context 'when run_auto_devops_pipeline_explicit is true' do
-      let(:params) { { run_auto_devops_pipeline_explicit: 'true' } }
+    context 'when auto devops is explicitly enabled' do
+      before do
+        project.create_auto_devops!(enabled: true)
+      end
 
       it { is_expected.to eq(true) }
     end
 
-    context 'when run_auto_devops_pipeline_implicit is true' do
-      let(:params) { { run_auto_devops_pipeline_implicit: 'true' } }
+    context 'when auto devops is explicitly disabled' do
+      before do
+        project.create_auto_devops!(enabled: false)
+      end
 
-      it { is_expected.to eq(true) }
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when auto devops is set to instance setting' do
+      before do
+        project.create_auto_devops!(enabled: nil)
+        allow(project.auto_devops).to receive(:previous_changes).and_return('enabled' => true)
+      end
+
+      context 'when auto devops is enabled system-wide' do
+        before do
+          stub_application_setting(auto_devops_enabled: true)
+        end
+
+        it { is_expected.to eq(true) }
+      end
+
+      context 'when auto devops is disabled system-wide' do
+        before do
+          stub_application_setting(auto_devops_enabled: false)
+        end
+
+        it { is_expected.to eq(false) }
+      end
     end
   end