diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 21:09:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 21:09:25 +0000 |
| commit | 14846c044abb7c8b5230a6df9d5475728249f7e5 (patch) | |
| tree | b7c85625d1881480abe6ed466bbb6b70139147e5 | |
| parent | 476199e0691edd956764ace45264511048fe6eb1 (diff) | |
| parent | 880fb9eac0888317db8bbf70587501ecfa115800 (diff) | |
| download | gitlab-ce-14846c044abb7c8b5230a6df9d5475728249f7e5.tar.gz | |
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
| -rw-r--r-- | lib/tasks/gitlab/cleanup.rake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake index 189ad6090a4..3c9802a0be4 100644 --- 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 |