diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 14:45:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 14:45:27 +0300 |
commit | 185d6a2578f64ffafd80bea5314915811a54486a (patch) | |
tree | 90d435f1c353da19b799046f66aa7abbf1bd778d /lib/gitlab | |
parent | 4530f5d0bdc9b2f60eed2146eaf1b6f35fc53b0e (diff) |
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/current_settings.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 7f55734f796..e7ffeeb9849 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -7,6 +7,10 @@ module Gitlab !signup_enabled? end + def signup_limited? + domain_allowlist.present? || email_restrictions_enabled? || require_admin_approval_after_user_signup? + end + def current_application_settings Gitlab::SafeRequestStore.fetch(:current_application_settings) { ensure_application_settings! } end |