deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #422 from steveprentice/master

Browse source 
This makes gitlabhq compatible with more LDAP servers (specifically OpenLDAP).
This commit is contained in:
Valeriy Sizov 2012-02-19 03:45:55 -08:00
commit a44b85be9e
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/omniauth_callbacks_controller.rb
View file

@ -2,8 +2,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
def ldap
# We only find ourselves here if the authentication to LDAP was successful.
omniauth = request.env["omniauth.auth"]["extra"]["raw_info"]
@user = User.find_for_ldap_auth(omniauth)
info = request.env["omniauth.auth"]["info"]
@user = User.find_for_ldap_auth(info)
if @user.persisted?
@user.remember_me = true
end