diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/helpers/users | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/helpers/users')
-rw-r--r-- | app/helpers/users/callouts_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/users/callouts_helper.rb b/app/helpers/users/callouts_helper.rb index a9fd219bbac..6ab78b58457 100644 --- a/app/helpers/users/callouts_helper.rb +++ b/app/helpers/users/callouts_helper.rb @@ -49,7 +49,7 @@ module Users def show_registration_enabled_user_callout? !Gitlab.com? && - current_user&.admin? && + current_user&.can_admin_all_resources? && signup_enabled? && !user_dismissed?(REGISTRATION_ENABLED_CALLOUT) && REGISTRATION_ENABLED_CALLOUT_ALLOWED_CONTROLLER_PATHS.any? { |path| controller.controller_path.match?(path) } @@ -59,7 +59,7 @@ module Users end def show_security_newsletter_user_callout? - current_user&.admin? && + current_user&.can_admin_all_resources? && !user_dismissed?(SECURITY_NEWSLETTER_CALLOUT) end |