Merge branch 'always-show-pipelines-must-succeed-checkbox' into 'master'

Always show "Pipelines must succeed" checkbox

Closes #57291

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

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -175,11 +175,6 @@ export default {
       if (value === 0) toggleHiddenClassBySelector('.merge-requests-feature', true);
       else if (oldValue === 0) toggleHiddenClassBySelector('.merge-requests-feature', false);
     },
-
-    buildsAccessLevel(value, oldValue) {
-      if (value === 0) toggleHiddenClassBySelector('.builds-feature', true);
-      else if (oldValue === 0) toggleHiddenClassBySelector('.builds-feature', false);
-    },
   },
 
   methods: {

app/views/projects/_merge_request_merge_checks_settings.html.haml

@@ -3,7 +3,7 @@
 .form-group
   %b= s_('ProjectSettings|Merge checks')
   %p.text-secondary= s_('ProjectSettings|These checks must pass before merge requests can be merged')
-  .form-check.mb-2.builds-feature{ class: ("hidden" if @project && @project.project_feature.send(:builds_access_level) == 0) }
+  .form-check.mb-2.builds-feature
     = form.check_box :only_allow_merge_if_pipeline_succeeds, class: 'form-check-input'
     = form.label :only_allow_merge_if_pipeline_succeeds, class: 'form-check-label' do
       = s_('ProjectSettings|Pipelines must succeed')

changelogs/unreleased/always-show-pipelines-must-succeed-checkbox.yml

+---
+title: Always show "Pipelines must succeed" checkbox
+merge_request: 28651
+author:
+type: fixed

spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb

@@ -51,7 +51,7 @@ describe 'Projects > Settings > User manages merge request settings' do
       end
 
       it 'shows the Merge Requests settings that do not depend on Builds feature' do
-        expect(page).not_to have_content 'Pipelines must succeed'
+        expect(page).to have_content 'Pipelines must succeed'
         expect(page).to have_content 'All discussions must be resolved'
 
         within('.sharing-permissions-form') do