Disable automatic login feature when clicking on email confirmation links

2016-11-14 20:30:12 -05:00 · 2016-11-14 20:30:12 -05:00 · 52867e15ac
parent 8dc2163ce5
commit 52867e15ac
2 changed files with 6 additions and 6 deletions
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@ -14,12 +14,8 @@ class ConfirmationsController < Devise::ConfirmationsController
    if signed_in?(resource_name)
      after_sign_in_path_for(resource)
    else
-      sign_in(resource)
-      if signed_in?(resource_name)
-        after_sign_in_path_for(resource)
-      else
-        new_session_path(resource_name)
-      end
+      flash[:notice] += " Please sign in."
+      new_session_path(resource_name)
    end
  end
 end
--- a/changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml
+++ b/changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml
@ -0,0 +1,4 @@
+---
+title: Disable automatic login after clicking email confirmation links
+merge_request: 7472
+author: