diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/helpers/application_settings_helper.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
-rw-r--r-- | app/helpers/application_settings_helper.rb | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 9c408efe8cd..512649b3008 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -199,14 +199,14 @@ module ApplicationSettingsHelper :default_projects_limit, :default_snippet_visibility, :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, - :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, + :domain_denylist, + :domain_denylist_enabled, + # TODO Remove domain_denylist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204) + :domain_denylist_raw, + :domain_allowlist, + # 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, @@ -394,6 +394,10 @@ module ApplicationSettingsHelper def show_documentation_base_url_field? Feature.enabled?(:help_page_documentation_redirect) end + + def signup_enabled? + !!Gitlab::CurrentSettings.signup_enabled + end end ApplicationSettingsHelper.prepend_if_ee('EE::ApplicationSettingsHelper') |