From 60e912453247fce53f0ed975f675b9f48bcfb54f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 23 Mar 2022 11:08:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-9-stable-ee --- app/controllers/admin/application_settings_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 0dd85376050..a680c1f4517 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -202,7 +202,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/29418') end - def application_setting_params + def application_setting_params # rubocop:disable Metrics/AbcSize params[:application_setting] ||= {} if params[:application_setting].key?(:enabled_oauth_sign_in_sources) @@ -229,6 +229,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController params.delete(:domain_denylist_raw) if params[:domain_denylist] params.delete(:domain_allowlist_raw) if params[:domain_allowlist] + if params[:application_setting].key?(:user_email_lookup_limit) + params[:application_setting][:search_rate_limit] ||= params[:application_setting][:user_email_lookup_limit] + end + params[:application_setting].permit(visible_application_setting_attributes) end -- cgit v1.2.1