diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-08-21 08:39:23 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-08-21 08:39:23 +0300 |
| commit | 366c0065c4302eacbb26ba7292c4c0528dbd33a6 (patch) | |
| tree | cc49f0e4303ac1d4982dc05bfd1654d22dddd856 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | b2b88b2ff2a3044efa259d06c630dc903d0851bd (diff) | |
| parent | 335b3ed19791d2bf5aea9c95f46af925ebc80412 (diff) | |
| download | gitlab-ce-366c0065c4302eacbb26ba7292c4c0528dbd33a6.tar.gz | |
Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap
Conflicts:
app/models/user.rb
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index d19931e93d7..d472936b4b4 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -12,8 +12,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 |