Merge branch '330227-okr-admin-area-notes-rate-limits' into 'master'

Settings UI text - Admin Area-Network/Notes Rate Limits

See merge request gitlab-org/gitlab!69940

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

@@ -3,10 +3,13 @@
 
   %fieldset
     .form-group
-      = f.label :notes_create_limit, _('Max requests per minute per user'), class: 'label-bold'
+      = f.label :notes_create_limit, _('Maximum requests per minute'), class: 'label-bold'
       = f.number_field :notes_create_limit, class: 'form-control gl-form-input'
     .form-group
-      = f.label :notes_create_limit_allowlist, _('List of users to be excluded from the limit'), class: 'label-bold'
+      = f.label :notes_create_limit_allowlist, _('Users to exclude from the rate limit'), class: 'label-bold'
       = f.text_area :notes_create_limit_allowlist_raw, placeholder: 'username1, username2', class: 'form-control gl-form-input', rows: 5
+      .form-text.text-muted
+        = _('Comma-separated list of users allowed to exceed the rate limit.')
+
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm", data: { qa_selector: 'save_changes_button' }

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

@@ -99,11 +99,12 @@
 %section.settings.as-note-limits.no-animate#js-note-limits-settings{ class: ('expanded' if expanded_by_default?) }
   .settings-header
     %h4
-      = _('Notes Rate Limits')
+      = _('Notes rate limit')
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Configure limit for notes created per minute by web and API requests.')
+      = _('Set the per-user rate limit for notes created by web or API requests.')
+      = link_to _('Learn more.'), help_page_path('user/admin_area/settings/rate_limit_on_notes_creation.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     = render 'note_limits'
 

doc/user/admin_area/settings/rate_limit_on_notes_creation.md

@@ -9,15 +9,15 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53637) in GitLab 13.9.
 
-This setting allows you to rate limit the requests to the note creation endpoint.
+You can configure the per-user rate limit for requests to the note creation endpoint.
 
 To change the note creation rate limit:
 
 1. On the top bar, select **Menu > Admin**.
 1. On the left sidebar, select **Settings > Network**.
-1. Expand **Notes Rate Limits**.
-1. Under **Max requests per minute per user**, enter the new value.
-1. Optional. Under **List of users to be excluded from the limit**, list users to be excluded from the limit.
+1. Expand **Notes rate limit**.
+1. In the **Maximum requests per minute** box, enter the new value.
+1. Optional. In the **Users to exclude from the rate limit** box, list users allowed to exceed the limit.
 1. Select **Save changes**.
 
 This limit is:

locale/gitlab.pot

@@ -8158,6 +8158,9 @@ msgstr ""
 msgid "Comma-separated list of email addresses."
 msgstr ""
 
+msgid "Comma-separated list of users allowed to exceed the rate limit."
+msgstr ""
+
 msgid "Comma-separated, e.g. '1.1.1.1, 2.2.2.0/24'"
 msgstr ""
 
@@ -8520,9 +8523,6 @@ msgstr ""
 msgid "Configure existing installation"
 msgstr ""
 
-msgid "Configure limit for notes created per minute by web and API requests."
-msgstr ""
-
 msgid "Configure limits for web and API requests."
 msgstr ""
 
@@ -20255,9 +20255,6 @@ msgstr ""
 msgid "List of all merge commits"
 msgstr ""
 
-msgid "List of users to be excluded from the limit"
-msgstr ""
-
 msgid "List options"
 msgstr ""
 
@@ -20675,9 +20672,6 @@ msgstr ""
 msgid "Max file size is 200 KB."
 msgstr ""
 
-msgid "Max requests per minute per user"
-msgstr ""
-
 msgid "Max role"
 msgstr ""
 
@@ -20837,6 +20831,9 @@ msgstr ""
 msgid "Maximum push size (MB)"
 msgstr ""
 
+msgid "Maximum requests per minute"
+msgstr ""
+
 msgid "Maximum running slices"
 msgstr ""
 
@@ -22998,7 +22995,7 @@ msgstr ""
 msgid "NoteForm|Note"
 msgstr ""
 
-msgid "Notes Rate Limits"
+msgid "Notes rate limit"
 msgstr ""
 
 msgid "Notes|Are you sure you want to cancel creating this comment?"
@@ -30709,6 +30706,9 @@ msgstr ""
 msgid "Set the milestone to %{milestone_reference}."
 msgstr ""
 
+msgid "Set the per-user rate limit for notes created by web or API requests."
+msgstr ""
+
 msgid "Set the timeout in seconds to send a secondary site status to the primary and IPs allowed for the secondary sites."
 msgstr ""
 
@@ -36890,6 +36890,9 @@ msgstr ""
 msgid "Users requesting access to"
 msgstr ""
 
+msgid "Users to exclude from the rate limit"
+msgstr ""
+
 msgid "Users were successfully added."
 msgstr ""