Disable automatic login feature when clicking on email confirmation links

52867e15 · Brian Neel · 8dc2163c · 52867e15 · 52867e15
Commit 52867e15 authored Nov 14, 2016 by Brian Neel
2 changed files
--- 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)
+      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
--- a/changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml
+++ b/changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml
+---
+title: Disable automatic login after clicking email confirmation links
+merge_request: 7472
+author: