Merge branch '323431_enable_allow_force_push_to_protected_branches_ff' into 'master'

Enable `allow_force_push_to_protected_branches` by default

See merge request gitlab-org/gitlab!57053

app/models/protected_branch.rb

@@ -30,7 +30,7 @@ class ProtectedBranch < ApplicationRecord
   end
 
   def self.allow_force_push?(project, ref_name)
-    return false unless ::Feature.enabled?(:allow_force_push_to_protected_branches, project)
+    return false unless ::Feature.enabled?(:allow_force_push_to_protected_branches, project, default_enabled: :yaml)
 
     project.protected_branches.allowing_force_push.matching(ref_name).any?
   end

app/views/projects/protected_branches/shared/_branches_list.html.haml

@@ -23,7 +23,7 @@
           %th
             = s_("ProtectedBranch|Allowed to push")
 
-          - if ::Feature.enabled?(:allow_force_push_to_protected_branches, @project)
+          - if ::Feature.enabled?(:allow_force_push_to_protected_branches, @project, default_enabled: :yaml)
             %th
               = s_("ProtectedBranch|Allow force push")
               %span.has-tooltip{ data: { container: 'body' }, title: s_('ProtectedBranch|Allow force push for all users with push access.'), 'aria-hidden': 'true' }

app/views/projects/protected_branches/shared/_create_protected_branch.html.haml

@@ -21,7 +21,7 @@
         = f.label :push_access_levels_attributes, s_("ProtectedBranch|Allowed to push:"), class: 'col-md-2 text-left text-md-right'
         .col-md-10
           = yield :push_access_levels
-      - if ::Feature.enabled?(:allow_force_push_to_protected_branches, @project)
+      - if ::Feature.enabled?(:allow_force_push_to_protected_branches, @project, default_enabled: :yaml)
         .form-group.row
           = f.label :allow_force_push, s_("ProtectedBranch|Allow force push:"), class: 'col-md-2 gl-text-left text-md-right'
           .col-md-10

app/views/shared/projects/protected_branches/_update_protected_branch.html.haml

@@ -33,6 +33,6 @@
     %p.small
       = _('Members of %{group} can also push to this branch: %{branch}') % { group: (group_push_access_levels.size > 1 ? 'these groups' : 'this group'), branch: group_push_access_levels.map(&:humanize).to_sentence }
 
-- if ::Feature.enabled?(:allow_force_push_to_protected_branches, @project)
+- if ::Feature.enabled?(:allow_force_push_to_protected_branches, @project, default_enabled: :yaml)
   %td
     = render "shared/buttons/project_feature_toggle", is_checked: protected_branch.allow_force_push, label: s_("ProtectedBranch|Toggle allow force push"), class_list: "js-force-push-toggle project-feature-toggle", data: { qa_selector: 'force_push_toggle_button', qa_branch_name: protected_branch.name }

changelogs/unreleased/323431_enable_allow_force_push_to_protected_branches_ff.yml

+---
+title: Allow users to enable force push to protected branches
+merge_request: 57053
+author:
+type: added

config/feature_flags/development/allow_force_push_to_protected_branches.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323431
 milestone: '13.10'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true

doc/user/project/protected_branches.md

@@ -177,13 +177,12 @@ Deleting a protected branch is allowed only by using the web interface; not from
 This means that you can't accidentally delete a protected branch from your
 command line or a Git client application.
 
-## Allow force push on protected branches **(FREE SELF)**
+## Allow force push on protected branches
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15611) in GitLab 13.10.
-> - It's [deployed behind a feature flag](../feature_flags.md), disabled by default.
-> - It's disabled on GitLab.com.
-> - It's not recommended for production use.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-allow-force-push-on-protected-branches).
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15611) in GitLab 13.10 behind a disabled feature flag.
+> - It's enabled on GitLab.com.
+> - It's recommended for production use.
+> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-allow-force-push-on-protected-branches).
 
 WARNING:
 This feature might not be available to you. Check the **version history** note above for details.
@@ -253,8 +252,8 @@ for details about the pipelines security model.
 
 ## Enable or disable allow force push on protected branches **(FREE SELF)**
 
-Allow force push on protected branches is under development and not ready for
-production use. It is deployed behind a feature flag that is **disabled by default**.
+Allow force push on protected branches is ready for
+production use. It is deployed behind a feature flag that is **enabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
 can enable it.
 

ee/app/views/projects/protected_branches/ee/_protected_branch_access_summary.html.haml

@@ -6,6 +6,6 @@
 %td
   = render partial: 'projects/settings/ee/access_level_dropdown', locals: { protected_branch: protected_branch, access_levels: protected_branch.push_access_levels, level_frequencies: access_level_frequencies(protected_branch.push_access_levels), input_basic_name: 'push_access_levels', disabled: !can_unprotect, toggle_class: 'js-allowed-to-push' }
 
-- if ::Feature.enabled?(:allow_force_push_to_protected_branches, @project)
+- if ::Feature.enabled?(:allow_force_push_to_protected_branches, @project, default_enabled: :yaml)
   %td
     = render "shared/buttons/project_feature_toggle", is_checked: protected_branch.allow_force_push, label: s_("ProtectedBranch|Toggle allow force push"), class_list: "js-force-push-toggle project-feature-toggle", data: { qa_selector: 'force_push_toggle_button', qa_branch_name: protected_branch.name }