summaryrefslogtreecommitdiff
path: root/app/helpers/users_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-18 12:13:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-18 12:13:06 +0000
commitc7b2529418eb0fb802637709eafe8016a4d106b0 (patch)
tree858333642b5a371009f4e4eabcd5c0e2dd5df25f /app/helpers/users_helper.rb
parent31522c5182bf14886900131c12d17d004ce28534 (diff)
downloadgitlab-ce-c7b2529418eb0fb802637709eafe8016a4d106b0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/users_helper.rb')
-rw-r--r--app/helpers/users_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index cae2addea9c..679102fcd83 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -197,6 +197,9 @@ module UsersHelper
banned_badge = { text: s_('AdminUsers|Banned'), variant: 'danger' }
return banned_badge if user.banned?
+ ldap_blocked_badge = { text: s_('AdminUsers|LDAP Blocked'), variant: 'danger' }
+ return ldap_blocked_badge if user.ldap_blocked?
+
{ text: s_('AdminUsers|Blocked'), variant: 'danger' }
end