summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-11-12 16:35:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-11-12 16:35:38 +0200
commitb952b890b46720252d78ee217f7bc31e6ed2a960 (patch)
tree9bef616e7fa6748b3fbf5e277e44631294d54760
parent3898c8c21ca08517553bb0987482eb9bd66e4421 (diff)
parentdfcc59a92b9c3740cf4c1ee34a8fb45753bfbe20 (diff)
downloadgitlab-ce-b952b890b46720252d78ee217f7bc31e6ed2a960.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--lib/tasks/gitlab/cleanup.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake
index 63dcdc52370..189ad6090a4 100644
--- a/lib/tasks/gitlab/cleanup.rake
+++ b/lib/tasks/gitlab/cleanup.rake
@@ -92,11 +92,11 @@ namespace :gitlab do
User.ldap.each do |ldap_user|
print "#{ldap_user.name} (#{ldap_user.extern_uid}) ..."
- if Gitlab::LDAP::Access.open { |access| access.allowed?(ldap_user) }
+ if Gitlab::LDAP::Access.allowed?(ldap_user)
puts " [OK]".green
else
if block_flag
- ldap_user.block!
+ ldap_user.block! unless ldap_user.blocked?
puts " [BLOCKED]".red
else
puts " [NOT IN LDAP]".yellow