Improve ad_disabled method name

3 files changed, 4 insertions, 4 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
diff --git a/spec/lib/gitlab/ldap/ldap_access_spec.rb b/spec/lib/gitlab/ldap/ldap_access_spec.rb
index e76cc4f2fde..d8c107502ba 100644
--- a/spec/lib/gitlab/ldap/ldap_access_spec.rb
+++ b/spec/lib/gitlab/ldap/ldap_access_spec.rb
@@ -17,13 +17,13 @@ describe Gitlab::LDAP::Access do
       before { Gitlab::LDAP::Person.stub(find_by_dn: :ldap_user) }
 
       context 'and the Active Directory disabled flag is set' do
-        before { Gitlab::LDAP::Person.stub(ad_disabled?: true) }
+        before { Gitlab::LDAP::Person.stub(active_directory_disabled?: true) }
 
         it { should be_false }
       end
 
       context 'and the Active Directory disabled flag is not set' do
-        before { Gitlab::LDAP::Person.stub(ad_disabled?: false) }
+        before { Gitlab::LDAP::Person.stub(active_directory_disabled?: false) }
 
         it { should be_true }
       end