Skip to content
Snippets Groups Projects
Commit 58786a7a authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'disable-automatic-login-on-email-confirmation' into 'master'

Disable automatic login feature when clicking on email confirmation links

See merge request !7472
parents b60de9c0 52867e15
No related branches found
No related tags found
No related merge requests found
Loading
@@ -14,12 +14,8 @@ class ConfirmationsController < Devise::ConfirmationsController
Loading
@@ -14,12 +14,8 @@ class ConfirmationsController < Devise::ConfirmationsController
if signed_in?(resource_name) if signed_in?(resource_name)
after_sign_in_path_for(resource) after_sign_in_path_for(resource)
else else
sign_in(resource) flash[:notice] += " Please sign in."
if signed_in?(resource_name) new_session_path(resource_name)
after_sign_in_path_for(resource)
else
new_session_path(resource_name)
end
end end
end end
end end
---
title: Disable automatic login after clicking email confirmation links
merge_request: 7472
author:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment