Merge branch 'dkua1-git-ssh-rate-limit' into 'master'

Add guidance to disable git SSH rate limit

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135460



Merged-by: Ash McKenzie <amckenzie@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Approved-by: Tomas Vik <tvik@gitlab.com>
Approved-by: Ash McKenzie <amckenzie@gitlab.com>
Reviewed-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: dkua1 <dkua@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>

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

@@ -15,5 +15,5 @@
         .form-group
           = f.label :gitlab_shell_operation_limit, s_('ShellOperations|Maximum number of Git operations per minute'), class: 'gl-font-bold'
           = f.number_field :gitlab_shell_operation_limit, class: 'form-control gl-form-input'
-
+          %span.form-text.text-muted= _('Set to 0 to disable the limit.')
       = f.submit _('Save changes'), pajamas_button: true

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

@@ -2,8 +2,7 @@
   = form_errors(@application_setting)
 
   %fieldset
-    = html_escape(_("Set any rate limit to %{code_open}0%{code_close} to disable the limit.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
-
+    = html_escape(_("Set to 0 to disable the limits."))
 
   %fieldset
     .form-group

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

@@ -11,16 +11,16 @@
       = f.label :raw_blob_request_limit, _('Raw blob request rate limit per minute'), class: 'label-bold'
       = f.number_field :raw_blob_request_limit, class: 'form-control gl-form-input'
       .form-text.text-muted
-        = _('Maximum number of requests per minute for each raw path (default is `300`). Set to `0` to disable throttling.')
+        = _('Maximum number of requests per minute for each raw path (default is 300). Set to 0 to disable throttling.')
     .form-group
       = f.label :push_event_hooks_limit, class: 'label-bold'
       = f.number_field :push_event_hooks_limit, class: 'form-control gl-form-input'
       .form-text.text-muted
-        = _('Maximum number of changes (branches or tags) in a single push above which webhooks and integrations are not triggered (default is `3`). Setting to `0` does not disable throttling.')
+        = _('Maximum number of changes (branches or tags) in a single push above which webhooks and integrations are not triggered (default is 3). Setting to 0 does not disable throttling.')
     .form-group
       = f.label :push_event_activities_limit, class: 'label-bold'
       = f.number_field :push_event_activities_limit, class: 'form-control gl-form-input'
       .form-text.text-muted
-        = _('Maximum number of changes (branches or tags) in a single push above which a bulk push event is created (default is `3`). Setting to `0` does not disable throttling.')
+        = _('Maximum number of changes (branches or tags) in a single push above which a bulk push event is created (default is 3). Setting to 0 does not disable throttling.')
 
   = f.submit _('Save changes'), pajamas_button: true

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

@@ -16,6 +16,6 @@
           = f.label :projects_api_rate_limit_unauthenticated, _('Maximum requests per 10 minutes per IP address'), class: 'label-bold'
           = f.number_field :projects_api_rate_limit_unauthenticated, class: 'form-control gl-form-input'
           .form-text.gl-text-gray-600
-            = _("Set this number to 0 to disable the limit.")
+            = _("Set to 0 to disable the limit.")
 
       = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true

locale/gitlab.pot

@@ -29156,10 +29156,10 @@ msgstr ""
 msgid "Maximum number of %{name} (%{count}) exceeded"
 msgstr ""
-msgid "Maximum number of changes (branches or tags) in a single push above which a bulk push event is created (default is `3`). Setting to `0` does not disable throttling."
+msgid "Maximum number of changes (branches or tags) in a single push above which a bulk push event is created (default is 3). Setting to 0 does not disable throttling."
 msgstr ""
-msgid "Maximum number of changes (branches or tags) in a single push above which webhooks and integrations are not triggered (default is `3`). Setting to `0` does not disable throttling."
+msgid "Maximum number of changes (branches or tags) in a single push above which webhooks and integrations are not triggered (default is 3). Setting to 0 does not disable throttling."
 msgstr ""
 msgid "Maximum number of comments exceeded"
@@ -29180,7 +29180,7 @@ msgstr ""
 msgid "Maximum number of requests per minute for an unauthenticated IP address"
 msgstr ""
-msgid "Maximum number of requests per minute for each raw path (default is `300`). Set to `0` to disable throttling."
+msgid "Maximum number of requests per minute for each raw path (default is 300). Set to 0 to disable throttling."
 msgstr ""
 msgid "Maximum number of stages per value stream exceeded"
@@ -44256,9 +44256,6 @@ msgstr ""
 msgid "Set a password on your account to pull or push via %{protocol}."
 msgstr ""
-msgid "Set any rate limit to %{code_open}0%{code_close} to disable the limit."
-msgstr ""
-
 msgid "Set due date"
 msgstr ""
@@ -44364,6 +44361,12 @@ msgstr ""
 msgid "Set to 0 for no size limit."
 msgstr ""
+msgid "Set to 0 to disable the limit."
+msgstr ""
+
+msgid "Set to 0 to disable the limits."
+msgstr ""
+
 msgid "Set to 0 to disable timeout."
 msgstr ""