summaryrefslogtreecommitdiff
path: root/app/models/instance_configuration.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-20 18:13:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-20 18:13:27 +0000
commit13f6669657483134a697b7ec7b701563165bc9d5 (patch)
tree4d6e9161ab8d060abcdc2a4c6180c9d8cb868b70 /app/models/instance_configuration.rb
parent068b3a417794ab8506b2e149301b3a60c01df078 (diff)
downloadgitlab-ce-13f6669657483134a697b7ec7b701563165bc9d5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/instance_configuration.rb')
-rw-r--r--app/models/instance_configuration.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/instance_configuration.rb b/app/models/instance_configuration.rb
index bbddc18103a..dc025e576ed 100644
--- a/app/models/instance_configuration.rb
+++ b/app/models/instance_configuration.rb
@@ -117,7 +117,8 @@ class InstanceConfiguration
group_export: application_setting_limit_per_minute(:group_export_limit),
group_export_download: application_setting_limit_per_minute(:group_download_export_limit),
group_import: application_setting_limit_per_minute(:group_import_limit),
- raw_blob: application_setting_limit_per_minute(:raw_blob_request_limit)
+ raw_blob: application_setting_limit_per_minute(:raw_blob_request_limit),
+ user_email_lookup: application_setting_limit_per_minute(:user_email_lookup_limit)
}
end