Merge branch 'DarrenEastman-master-patch-92285' into 'master'

Docs: Update Runner registration heading to be more explicit

See merge request gitlab-org/gitlab!78121

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

@@ -11,6 +11,6 @@
             = s_("Runners|Members of the %{type} can register runners") % { type: type }
       %span.form-text.gl-text-gray-600
         = _('If no options are selected, only administrators can register runners.')
-        = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'runner-registration'), target: '_blank', rel: 'noopener noreferrer'
+        = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'prevent-users-from-registering-runners'), target: '_blank', rel: 'noopener noreferrer'
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

app/views/groups/runners/_group_runners.html.haml

@@ -25,5 +25,5 @@
     %br
   - else
     = _('Please contact an admin to register runners.')
-    = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'runner-registration'), target: '_blank', rel: 'noopener noreferrer'
+    = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'prevent-users-from-registering-runners'), target: '_blank', rel: 'noopener noreferrer'
 

app/views/projects/runners/_specific_runners.html.haml

@@ -17,7 +17,7 @@
                       group_path: '' }
   - else
     = _('Please contact an admin to register runners.')
-    = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'runner-registration'), target: '_blank', rel: 'noopener noreferrer'
+    = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'prevent-users-from-registering-runners'), target: '_blank', rel: 'noopener noreferrer'
 
 %hr
 

doc/user/admin_area/settings/continuous_integration.md

@@ -268,13 +268,12 @@ To set the maximum file size:
 1. Enter the maximum file size, in bytes.
 1. Click **Save size limits**.
 
-## Runner registration
+## Prevent users from registering runners
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22225) in GitLab 14.1.
-> - [Deployed behind a feature flag](../../feature_flags.md), disabled by default.
-> - Disabled on GitLab.com.
-> - Not recommended for production use.
-> - To use in GitLab self-managed instances, ask a GitLab administrator to enable it.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22225) in GitLab 14.1.
+
+FLAG:
+On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../feature_flags.md) named `runner_registration_control`. On GitLab.com, this feature is not available.
 
 GitLab administrators can adjust who is allowed to register runners, by showing and hiding areas of the UI.
 
@@ -283,29 +282,14 @@ By default, all members of a project and group are able to register runners.
 To change this:
 
 1. On the top bar, select **Menu > Admin**.
-1. Go to **Settings > CI/CD**.
-1. Expand the **Runner registration** section.
-1. Select the desired options.
-1. Click **Save changes**.
-
-When the registration sections are hidden in the UI, members of the project or group that need to register runners must contact the administrators.
-
-This feature is currently behind a feature flag.
-To enable it:
-
-**In Omnibus installations:**
-
-1. Enter the Rails console:
-
-   ```shell
-   sudo gitlab-rails console
-   ```
-
-1. Flip the switch and enable the feature flag:
+1. On the left sidebar, select **Settings > CI/CD**.
+1. Expand **Runner registration**.
+1. Clear the checkbox if you don't want to display runner registration
+   information in the UI for group or project members.
+1. Select **Save changes**.
 
-   ```ruby
-   Feature.enable(:runner_registration_control)
-   ```
+WARNING:
+When the registration sections are hidden in the UI, members of the project or group that need to register runners must contact the administrators. If you plan to prevent registration, ensure users have access to the runners they need to run jobs.
 
 ## Troubleshooting