Merge commit '7c8ca0c6d6
' into kb-draft-5.16-lts
This commit is contained in:
commit
9190f53d7b
16 changed files with 213 additions and 34 deletions
|
@ -6,7 +6,7 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
|||
def self.provides_callback_for(provider)
|
||||
define_method provider do
|
||||
@provider = provider
|
||||
@user = User.find_for_oauth(request.env['omniauth.auth'], current_user)
|
||||
@user = User.find_for_omniauth(request.env['omniauth.auth'], current_user)
|
||||
|
||||
if @user.persisted?
|
||||
record_login_activity
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue