diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-18 00:08:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-18 00:08:58 +0000 |
commit | 099333e261623df9b960419e2761b2cbb0eb3882 (patch) | |
tree | 47d05cc18d6b20a16982b33e00bd1d144563f9e3 /lib/constraints | |
parent | a0b4a462b0c6f333651ae9e0c0ca1e5794e7b4e1 (diff) | |
download | gitlab-ce-099333e261623df9b960419e2761b2cbb0eb3882.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/constraints')
-rw-r--r-- | lib/constraints/admin_constrainer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/constraints/admin_constrainer.rb b/lib/constraints/admin_constrainer.rb index 59c855a1b73..2f32cc7ad91 100644 --- a/lib/constraints/admin_constrainer.rb +++ b/lib/constraints/admin_constrainer.rb @@ -3,7 +3,7 @@ module Constraints class AdminConstrainer def matches?(request) - if Feature.enabled?(:user_mode_in_session) + if Gitlab::CurrentSettings.admin_mode admin_mode_enabled?(request) else user_is_admin?(request) |