Merge branch 'mk/update-rate-limit-docs' into 'master'

Rate limits: Cross-link docs and tweak UI wording

See merge request gitlab-org/gitlab!26846

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

@@ -6,7 +6,7 @@
       .bs-callout.bs-callout-danger
         - relative_url_link = 'https://docs.gitlab.com/ee/user/admin_area/settings/protected_paths.html#migrate-settings-from-gitlab-123-and-earlier'
         - relative_url_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: relative_url_link }
-        = _("Omnibus Protected Paths throttle is active. From 12.4, Omnibus throttle is deprecated and will be removed in a future release. Please read the %{relative_url_link_start}Migrating Protected Paths documentation%{relative_url_link_end}.").html_safe % { relative_url_link_start: relative_url_link_start, relative_url_link_end: '</a>'.html_safe }
+        = _("Omnibus Protected Paths throttle is active, and takes priority over these settings. From 12.4, Omnibus throttle is deprecated and will be removed in a future release. Please read the %{relative_url_link_start}Migrating Protected Paths documentation%{relative_url_link_end}.").html_safe % { relative_url_link_start: relative_url_link_start, relative_url_link_end: '</a>'.html_safe }
 
     .form-group
       .form-check

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

@@ -42,7 +42,7 @@
     %button.btn.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Configure paths to be protected by Rack Attack. A web server restart is required after changing these settings.')
+      = _('Configure paths to be protected by Rack Attack.')
   .settings-content
     = render 'protected_paths'
 

doc/security/rate_limits.md

@@ -24,6 +24,7 @@ similarly mitigated by a rate limit.
 
 - [User and IP rate limits](../user/admin_area/settings/user_and_ip_rate_limits.md).
 - [Rate limits on raw endpoints](../user/admin_area/settings/rate_limits_on_raw_endpoints.md)
+- [Protected paths](../user/admin_area/settings/protected_paths.md).
 
 ## Rack Attack initializer
 

doc/user/admin_area/settings/protected_paths.md

@@ -4,7 +4,11 @@ type: reference
 
 # Protected paths **(CORE ONLY)**
 
-GitLab protects the following paths with Rack Attack by default:
+Rate limiting is a common technique used to improve the security and durability
+of a web application. For more details, see
+[Rate limits](../../../security/rate_limits.md).
+
+GitLab rate limits the following paths with Rack Attack by default:
 
 ```plaintext
 '/users/password',

locale/gitlab.pot

@@ -5172,7 +5172,7 @@ msgstr ""
 msgid "Configure limits on the number of inbound alerts able to be sent to a project."
 msgstr ""
 
-msgid "Configure paths to be protected by Rack Attack. A web server restart is required after changing these settings."
+msgid "Configure paths to be protected by Rack Attack."
 msgstr ""
 
 msgid "Configure repository mirroring."
@@ -13652,7 +13652,7 @@ msgstr ""
 msgid "OmniAuth"
 msgstr ""
 
-msgid "Omnibus Protected Paths throttle is active. From 12.4, Omnibus throttle is deprecated and will be removed in a future release. Please read the %{relative_url_link_start}Migrating Protected Paths documentation%{relative_url_link_end}."
+msgid "Omnibus Protected Paths throttle is active, and takes priority over these settings. From 12.4, Omnibus throttle is deprecated and will be removed in a future release. Please read the %{relative_url_link_start}Migrating Protected Paths documentation%{relative_url_link_end}."
 msgstr ""
 
 msgid "On track"