diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/models/application_setting_implementation.rb | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/models/application_setting_implementation.rb')
-rw-r--r-- | app/models/application_setting_implementation.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 25198178f69..415f0b35f3a 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -69,7 +69,9 @@ module ApplicationSettingImplementation domain_allowlist: Settings.gitlab['domain_allowlist'], dsa_key_restriction: 0, ecdsa_key_restriction: 0, + ecdsa_sk_key_restriction: 0, ed25519_key_restriction: 0, + ed25519_sk_key_restriction: 0, eks_access_key_id: nil, eks_account_id: nil, eks_integration_enabled: false, @@ -229,7 +231,9 @@ module ApplicationSettingImplementation rate_limiting_response_text: nil, whats_new_variant: 0, user_deactivation_emails_enabled: true, - user_email_lookup_limit: 60 + user_email_lookup_limit: 60, + users_get_by_id_limit: 300, + users_get_by_id_limit_allowlist: [] } end @@ -332,6 +336,14 @@ module ApplicationSettingImplementation self.notes_create_limit_allowlist = strings_to_array(values).map(&:downcase) end + def users_get_by_id_limit_allowlist_raw + array_to_string(self.users_get_by_id_limit_allowlist) + end + + def users_get_by_id_limit_allowlist_raw=(values) + self.users_get_by_id_limit_allowlist = strings_to_array(values).map(&:downcase) + end + def asset_proxy_whitelist=(values) values = strings_to_array(values) if values.is_a?(String) |