diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-09-01 16:35:18 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-09-01 16:35:18 +0200 |
| commit | c0323b40ee5633f2808f52f98bde0509a2f3ee59 (patch) | |
| tree | 9c587c3fa7bddf11f09fee0b0e119fb2708cf071 /lib | |
| parent | 26b14dd2d597d7bd5579cfcbad456abb0af6a5e5 (diff) | |
| download | gitlab-ce-c0323b40ee5633f2808f52f98bde0509a2f3ee59.tar.gz | |
Refactor: beter naming for active directory disabled users
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ldap/person.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index 62709a12942..c054b6f5865 100644 --- a/lib/gitlab/ldap/access.rb +++ b/lib/gitlab/ldap/access.rb @@ -28,7 +28,7 @@ module Gitlab def allowed?(user) if Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter) - !Gitlab::LDAP::Person.active_directory_disabled?(user.extern_uid, adapter) + !Gitlab::LDAP::Person.disabled_via_active_directory?(user.extern_uid, adapter) else false end diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb index 9ad6618bd46..87c3d711db4 100644 --- a/lib/gitlab/ldap/person.rb +++ b/lib/gitlab/ldap/person.rb @@ -16,7 +16,7 @@ module Gitlab adapter.user('dn', dn) end - def self.active_directory_disabled?(dn, adapter=nil) + def self.disabled_via_active_directory?(dn, adapter=nil) adapter ||= Gitlab::LDAP::Adapter.new adapter.dn_matches_filter?(dn, AD_USER_DISABLED) end |