diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 09:08:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 09:08:45 +0300 |
| commit | 4bc1e04a7adb4b183c713e5faff726579e909d1c (patch) | |
| tree | 1a77e5900059f9c89f74741fa7f2da151b1b58cc /app/helpers/application_settings_helper.rb | |
| parent | 06253b6c70d1770d842edb884dfecac20bcfec6c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 9c408efe8cd..3668d09e284 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -201,12 +201,12 @@ module ApplicationSettingsHelper :disabled_oauth_sign_in_sources, :domain_blacklist, :domain_blacklist_enabled, - # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204) - :domain_blacklist_raw, + # TODO Remove domain_denylist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204) + :domain_denylist_raw, :domain_whitelist, - # TODO Remove domain_whitelist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204) - :domain_whitelist_raw, - :outbound_local_requests_whitelist_raw, + # TODO Remove domain_allowlist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204) + :domain_allowlist_raw, + :outbound_local_requests_allowlist_raw, :dsa_key_restriction, :ecdsa_key_restriction, :ed25519_key_restriction, |