Merge branch...

Merge branch '258980-enable-feature-flag-by-default-of-admin-approval-for-new-user-signups' into 'master'

Resolve "[Feature flag] Enable `admin_approval_for_new_user_signups` by default"

See merge request gitlab-org/gitlab!45233

app/controllers/admin/users_controller.rb

@@ -300,7 +300,7 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def check_admin_approval_feature_available!
-    access_denied! unless Feature.enabled?(:admin_approval_for_new_user_signups)
+    access_denied! unless Feature.enabled?(:admin_approval_for_new_user_signups, default_enabled: true)
   end
 end
 

app/controllers/registrations_controller.rb

@@ -216,7 +216,7 @@ class RegistrationsController < Devise::RegistrationsController
   end
 
   def set_user_state
-    return unless Feature.enabled?(:admin_approval_for_new_user_signups)
+    return unless Feature.enabled?(:admin_approval_for_new_user_signups, default_enabled: true)
     return unless Gitlab::CurrentSettings.require_admin_approval_after_user_signup
 
     resource.state = BLOCKED_PENDING_APPROVAL_STATE

app/views/admin/application_settings/_signup.html.haml

@@ -9,7 +9,7 @@
           Sign-up enabled
           .form-text.text-muted
             = _("When enabled, any user visiting %{host} will be able to create an account.") % { host: "#{new_user_session_url(host: Gitlab.config.gitlab.host)}" }
-    - if Feature.enabled?(:admin_approval_for_new_user_signups)
+    - if Feature.enabled?(:admin_approval_for_new_user_signups, default_enabled: true)
       .form-group
         .form-check
           = f.check_box :require_admin_approval_after_user_signup, class: 'form-check-input'

app/views/admin/users/index.html.haml

@@ -30,7 +30,7 @@
       = link_to admin_users_path(filter: "blocked") do
         = s_('AdminUsers|Blocked')
         %small.badge.badge-pill= limited_counter_with_delimiter(User.blocked)
-    - if Feature.enabled?(:admin_approval_for_new_user_signups)
+    - if Feature.enabled?(:admin_approval_for_new_user_signups, default_enabled: true)
       = nav_link(html_options: { class: "#{active_when(params[:filter] == 'blocked_pending_approval')} filter-blocked-pending-approval" }) do
         = link_to admin_users_path(filter: "blocked_pending_approval") do
           = s_('AdminUsers|Pending approval')

changelogs/unreleased/258980-enable-feature-flag-by-default-of-admin-approval-for-new-user-sign.yml

+---
+title: Introduce 'admin approvals for new user signups' feature
+merge_request: 45233
+author:
+type: added

config/feature_flags/development/admin_approval_for_new_user_signups.yml

@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43827
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258980
 type: development
 group: group::access
-default_enabled: false
+default_enabled: true