Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-01-07 19:01:01 +0300
committerGabriel Mazetto <gabriel@gitlab.com>2016-01-08 21:26:04 +0300
commit47e4613f4adc2d6ef4b066a87ec772ef8044bdd5 (patch)
tree7abd1329e62dd97657dce22ad83f9500817c0d42 /app/services/repair_ldap_blocked_user_service.rb
parentec67e9be1d7486199b47e19c766202a8bfdefe93 (diff)
Code style fixes and some code simplified
Diffstat (limited to 'app/services/repair_ldap_blocked_user_service.rb')
-rw-r--r--app/services/repair_ldap_blocked_user_service.rb18
1 files changed, 10 insertions, 8 deletions
diff --git a/app/services/repair_ldap_blocked_user_service.rb b/app/services/repair_ldap_blocked_user_service.rb
index ceca15414e0..863cef7ff61 100644
--- a/app/services/repair_ldap_blocked_user_service.rb
+++ b/app/services/repair_ldap_blocked_user_service.rb
@@ -1,15 +1,17 @@
class RepairLdapBlockedUserService
- attr_accessor :user, :identity
+ attr_accessor :user
- def initialize(user, identity)
- @user, @identity = user, identity
+ def initialize(user)
+ @user = user
end
def execute
- if identity.destroyed?
- user.block if identity.is_ldap? && user.ldap_blocked? && !user.ldap_user?
- else
- user.block if !identity.is_ldap? && user.ldap_blocked? && !user.ldap_user?
- end
+ user.block if ldap_hard_blocked?
+ end
+
+ private
+
+ def ldap_hard_blocked?
+ user.ldap_blocked? && !user.ldap_user?
end
end