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:
authorJakub Jirutka <jakub@jirutka.cz>2012-07-29 18:15:52 +0400
committerJakub Jirutka <jakub@jirutka.cz>2012-07-29 18:15:52 +0400
commitfa5a53f5ed2914052e07ef8fd46879576c978563 (patch)
tree1940f94eeeb0bea0c63ee4d6c42682704d74bf9e /app/controllers/omniauth_callbacks_controller.rb
parent8b7e404b5b6944e9c92cc270b2e5d0005781d49d (diff)
Change identification of users with extern auth provider (LDAP)
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index fb759c371c4..5bad60939d1 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -15,8 +15,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
def ldap
# We only find ourselves here if the authentication to LDAP was successful.
- info = request.env["omniauth.auth"]["info"]
- @user = User.find_for_ldap_auth(info)
+ @user = User.find_for_ldap_auth(request.env["omniauth.auth"], current_user)
if @user.persisted?
@user.remember_me = true
end