From 52867e15acacf842e26816c9143c59fc9086c6fb Mon Sep 17 00:00:00 2001
From: Brian Neel <brian@gitlab.com>
Date: Mon, 14 Nov 2016 20:30:12 -0500
Subject: [PATCH] Disable automatic login feature when clicking on email
 confirmation links

---
 app/controllers/confirmations_controller.rb               | 8 ++------
 .../disable-autologin-on-email-confirmation-links.yml     | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml

diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index 3da44b9b888..306afb65f10 100644
--- 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
diff --git a/changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml b/changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml
new file mode 100644
index 00000000000..6dd0d748001
--- /dev/null
+++ 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: