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

Disable automatic login feature when clicking on email confirmation links See merge request !7472

Merge branch 'disable-automatic-login-on-email-confirmation' into 'master'
Disable automatic login feature when clicking on email confirmation links See merge request !7472
58786a7a · Marin Jankovski · b60de9c0 · 52867e15 · 58786a7a · 58786a7a
Commit 58786a7a authored Jan 24, 2017 by Marin Jankovski
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)
-        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: