diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 17:36:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 17:36:54 +0300 |
commit | f61bb2a16a514b71bf33aabbbb999d6732016a24 (patch) | |
tree | 9548caa89e60b4f40b99bbd1dac030420b812aa8 /app/helpers/nav_helper.rb | |
parent | 35fc54e5d261f8898e390aea7c2f5ec5fdf0539d (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42
Diffstat (limited to 'app/helpers/nav_helper.rb')
-rw-r--r-- | app/helpers/nav_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index c170e58b4ce..db144f63f92 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -92,10 +92,8 @@ module NavHelper links << :admin_impersonation end - if Feature.enabled?(:user_mode_in_session) - if current_user_mode.admin_mode? - links << :admin_mode - end + if Gitlab::CurrentSettings.admin_mode && current_user_mode.admin_mode? + links << :admin_mode end links |