diff options
Diffstat (limited to 'app/models/instance_configuration.rb')
| -rw-r--r-- | app/models/instance_configuration.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/models/instance_configuration.rb b/app/models/instance_configuration.rb index dc025e576ed..2016024b2f4 100644 --- a/app/models/instance_configuration.rb +++ b/app/models/instance_configuration.rb @@ -118,7 +118,12 @@ class InstanceConfiguration 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), - user_email_lookup: application_setting_limit_per_minute(:user_email_lookup_limit) + user_email_lookup: application_setting_limit_per_minute(:user_email_lookup_limit), + users_get_by_id: { + enabled: application_settings[:users_get_by_id_limit] > 0, + requests_per_period: application_settings[:users_get_by_id_limit], + period_in_seconds: 10.minutes + } } end @@ -147,7 +152,7 @@ class InstanceConfiguration end def ssh_algorithm_sha256(ssh_file_content) - Gitlab::SSHPublicKey.new(ssh_file_content).fingerprint('SHA256') + Gitlab::SSHPublicKey.new(ssh_file_content).fingerprint_sha256 end def application_settings |