Merge branch '344907-cz-rl-form-fix' into 'master'

Add missing input box for search rate limiting configuration

See merge request gitlab-org/gitlab!82944

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

@@ -3,11 +3,11 @@
 
   %fieldset
     .form-group
-      = f.label :search_rate_limit, _('Maximum authenticated requests by a user per minute'), class: 'label-bold'
+      = f.label :search_rate_limit, _('Maximum number of requests per minute for an authenticated user'), class: 'label-bold'
       .form-text.gl-text-gray-600
         = _("Set this number to 0 to disable the limit.")
+      = f.number_field :search_rate_limit, class: 'form-control gl-form-input'
 
-      = f.label :search_rate_limit, _('Maximum number of requests per minute for an authenticated user'), class: 'label-bold'
     .form-group
       = f.label :search_rate_limit_unauthenticated, _('Maximum number of requests per minute for an unauthenticated IP address'), class: 'label-bold'
       = f.number_field :search_rate_limit_unauthenticated, class: 'form-control gl-form-input'

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

@@ -48,7 +48,7 @@
   .settings-content
     = render partial: 'network_rate_limits', locals: { anchor: 'js-files-limits-settings', setting_fragment: 'files_api' }
 
-%section.settings.as-note-limits.no-animate#js-search-limits-settings{ class: ('expanded' if expanded_by_default?) }
+%section.settings.as-search-limits.no-animate#js-search-limits-settings{ class: ('expanded' if expanded_by_default?) }
   .settings-header
     %h4
       = _('Search rate limits')

doc/administration/instance_limits.md

@@ -153,6 +153,17 @@ Set the limit to `0` to disable it.
 
 - **Default rate limit**: Disabled (unlimited).
 
+### Search rate limit
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80631) in GitLab 14.9
+
+This setting limits global search requests.
+
+| Limit                   | Default (requests per minute) |
+|-------------------------|-------------------------------|
+| Authenticated user      | 30 |
+| Unauthenticated user    | 10 |
+
 ## Gitaly concurrency limit
 
 Clone traffic can put a large strain on your Gitaly service. To prevent such workloads from overwhelming your Gitaly server, you can set concurrency limits in Gitaly's configuration file.

doc/user/admin_area/settings/index.md

@@ -130,6 +130,7 @@ The **Network** settings contain:
     Git LFS requests that supersede the user and IP rate limits.
   - [Files API Rate Limits](files_api_rate_limits.md) - Configure specific limits for
     Files API requests that supersede the user and IP rate limits.
+  - [Search rate limits](../../../administration/instance_limits.md#search-rate-limit) - Configure global search request rate limits for authenticated and unauthenticated users.
   - [Deprecated API Rate Limits](deprecated_api_rate_limits.md) - Configure specific limits
     for deprecated API requests that supersede the user and IP rate limits.
 - [Outbound requests](../../../security/webhooks.md) - Allow requests to the local network from hooks and services.

locale/gitlab.pot

@@ -22841,9 +22841,6 @@ msgstr ""
 msgid "Maximum authenticated API requests per rate limit period per user"
 msgstr ""
 
-msgid "Maximum authenticated requests by a user per minute"
-msgstr ""
-
 msgid "Maximum authenticated web requests per rate limit period per user"
 msgstr ""
 

spec/features/admin/admin_settings_spec.rb

@@ -707,6 +707,20 @@ RSpec.describe 'Admin updates settings' do
 
         include_examples 'regular throttle rate limit settings'
       end
+
+      it 'changes search rate limits' do
+        visit network_admin_application_settings_path
+
+        page.within('.as-search-limits') do
+          fill_in 'Maximum number of requests per minute for an authenticated user', with: 98
+          fill_in 'Maximum number of requests per minute for an unauthenticated IP address', with: 76
+          click_button 'Save changes'
+        end
+
+        expect(page).to have_content "Application settings saved successfully"
+        expect(current_settings.search_rate_limit).to eq(98)
+        expect(current_settings.search_rate_limit_unauthenticated).to eq(76)
+      end
     end
 
     context 'Preferences page' do