Merge branch 'bugfix/block_ldap_users_cronjob' into 'master'

Fixed rake task gitlab:cleanup:block_removed_ldap_users Maybe not the most elegant solution, but it works for us. This closes issue gitlab-org/gitlab-ce#955. See merge request !338

Merge branch 'bugfix/block_ldap_users_cronjob' into 'master'
14846c04 · Dmitriy Zaporozhets · 476199e0 · 880fb9ea · 14846c04
Commit 14846c04 authored Mar 19, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

cleanup.rake lib/tasks/gitlab/cleanup.rake +5 -4

No files found.
--- a/lib/tasks/gitlab/cleanup.rake
+++ b/lib/tasks/gitlab/cleanup.rake
@@ -90,13 +90,14 @@ namespace :gitlab do
      warn_user_is_not_gitlab
      block_flag = ENV['BLOCK']

-      User.ldap.each do |ldap_user|
-        print "#{ldap_user.name} (#{ldap_user.extern_uid}) ..."
-        if Gitlab::LDAP::Access.allowed?(ldap_user)
+      User.find_each do |user|
+        next unless user.ldap_user?
+        print "#{user.name} (#{user.ldap_identity.extern_uid}) ..."
+        if Gitlab::LDAP::Access.allowed?(user)
          puts " [OK]".green
        else
          if block_flag
-            ldap_user.block! unless ldap_user.blocked?
+            user.block! unless user.blocked?
            puts " [BLOCKED]".red
          else
            puts " [NOT IN LDAP]".yellow