From b8faeac58380f3dcc04e2741d4c69d900b862de9 Mon Sep 17 00:00:00 2001
From: Luke Duncalfe <lduncalfe@gitlab.com>
Date: Tue, 21 Mar 2023 07:50:54 +0000
Subject: [PATCH] Add docs for runner version management

This updates the docs to describe the feature added in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114041

It also updates workaround for Filtering outbound requests to be to
disable the fetching of data from GitLab.com through the admin:
https://gitlab.com/gitlab-org/gitlab/-/issues/377371#note_1294228003
---
 doc/security/webhooks.md                       | 11 +++--------
 .../settings/continuous_integration.md         | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md
index 6164fb794c29..81e7878c9dfe 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -152,15 +152,10 @@ If you can't enable this setting, do one of the following:
 ### Public runner releases URL is blocked
 
 Most GitLab instances have their `public_runner_releases_url` set to
-`https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-runner/releases`.
-You can't change or disable this setting in the Admin Area, which can prevent you from [filtering requests](#filter-requests).
+`https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-runner/releases`,
+which can prevent you from [filtering requests](#filter-requests).
 
-To enable the setting, use the [Rails console](../administration/operations/rails_console.md) to set `public_runner_releases_url` to the instance host:
-
-```ruby
-current_settings = ApplicationSetting.find_or_create_without_cache;
-ApplicationSettings::UpdateService.new(current_settings, nil, public_runner_releases_url: Gitlab.config.gitlab.base_url).execute
-```
+To resolve this issue, [configure GitLab to no longer fetch runner release version data from GitLab.com](../user/admin_area/settings/continuous_integration.md#disable-runner-version-management).
 
 ### GitLab subscription management is blocked
 
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index 8f7081a909d1..36277c209d84 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -345,8 +345,8 @@ To restrict all users in an instance from registering runners:
 1. On the top bar, select **Main menu > Admin**.
 1. On the left sidebar, select **Settings > CI/CD**.
 1. Expand **Runners**.
-1. Clear the checkbox if you don't want to display runner registration
-   information in the UI for group or project members.
+1. In the **Runner registration** section, clear the **Members of the project can register runners** and
+   **Members of the group can register runners** checkboxes to remove runner registration from the UI.
 1. Select **Save changes**.
 
 NOTE:
@@ -370,6 +370,20 @@ To restrict runner registration by members in a specific group:
 1. Clear the **New group runners can be registered** checkbox if you want to disable runner registration by all members in the group. If the setting is read-only, you must enable runner registration for the [instance](#restrict-runner-registration-by-all-users-in-an-instance).
 1. Select **Save changes**.
 
+## Disable runner version management
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114041) in GitLab 15.10.
+
+By default, GitLab instances periodically fetch official runner version data from GitLab.com to [determine whether the runners need upgrades](../../../ci/runners/configure_runners.md#determine-which-runners-need-to-be-upgraded).
+
+To disable your instance fetching this data:
+
+1. On the top bar, select **Main menu > Admin**.
+1. On the left sidebar, select **Settings > CI/CD**.
+1. Expand **Runners**.
+1. In the **Runner version management** section, clear the **Fetch GitLab Runner release version data from GitLab.com** checkbox.
+1. Select **Save changes**.
+
 ## Troubleshooting
 
 ### 413 Request Entity Too Large
-- 
GitLab