summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJan-Willem van der Meer <mail@jewilmeer.nl>2014-09-08 15:25:42 +0200
committerJan-Willem van der Meer <mail@jewilmeer.nl>2014-09-08 15:25:42 +0200
commitb18d1c2786c2a385d6b797734a1afad7a01ddf35 (patch)
tree96e2dc4a59f6c60f17c4c2374029e90f015b7d23 /lib
parent11bb67c3c6d4b90629744f8a011121e35968c58b (diff)
downloadgitlab-ce-b18d1c2786c2a385d6b797734a1afad7a01ddf35.tar.gz
Remove duplicated create method
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/user.rb10
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index e0d718d1065..25b5a702f9a 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -26,16 +26,6 @@ module Gitlab
end
end
- # overloaded from Gitlab::Oauth::User
- # TODO: it's messy, needs cleanup, less complexity
- def create(auth_hash)
- ldap_user = new(auth_hash)
- # first try to find the user based on the returned email address
-
- # if the user isn't found by an exact email match, use oauth methods
- ldap_user.save_and_trigger_callbacks
- end
-
def authenticate(login, password)
# Check user against LDAP backend if user is not authenticated
# Only check with valid login and password to prevent anonymous bind results