diff options
Diffstat (limited to 'app/controllers/confirmations_controller.rb')
| -rw-r--r-- | app/controllers/confirmations_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index 7bc46a6ccc0..a7200b63b7e 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -13,10 +13,9 @@ class ConfirmationsController < Devise::ConfirmationsController end def after_confirmation_path_for(resource_name, resource) - accept_pending_invitations - # incoming resource can either be a :user or an :email if signed_in?(:user) + accept_pending_invitations after_sign_in(resource) else Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}") |