summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-05-14 19:13:06 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-05-14 19:13:06 +0200
commitbe1120e9681bfb83084c7aeadae3e83692901de9 (patch)
treeed81e766d84ed83adeea1f9837b42674592203d3 /lib
parenta966f72224427fe6830426f459d445cd19ecd5a0 (diff)
downloadgitlab-ce-be1120e9681bfb83084c7aeadae3e83692901de9.tar.gz
Improve ad_disabled method name
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/access.rb2
-rw-r--r--lib/gitlab/ldap/person.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index 71931b79f62..4e48ff11871 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -15,7 +15,7 @@ module Gitlab
def allowed?(user)
if Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
- !Gitlab::LDAP::Person.ad_disabled?(user.extern_uid, adapter)
+ !Gitlab::LDAP::Person.active_directory_disabled?(user.extern_uid, adapter)
else
false
end
diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb
index 3a97944b122..9ad6618bd46 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.ad_disabled?(dn, adapter=nil)
+ def self.active_directory_disabled?(dn, adapter=nil)
adapter ||= Gitlab::LDAP::Adapter.new
adapter.dn_matches_filter?(dn, AD_USER_DISABLED)
end