Merge pull request #4807 from techAPJ/email-token-social

FIX: confirm email token for user created via social login

app/controllers/users/omniauth_callbacks_controller.rb

@@ -112,7 +112,8 @@ class Users::OmniauthCallbacksController < ApplicationController
   def user_found(user)
     # automatically activate/unstage any account if a provider marked the email valid
     if @auth_result.email_valid && @auth_result.email == user.email
-      user.update!(staged: false, active: true)
+      user.update!(staged: false)
+      user.activate
     end
 
     if ScreenedIpAddress.should_block?(request.remote_ip)