BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 52867e15 by Brian Neel
Options

Disable automatic login feature when clicking on email confirmation links

parent 8dc2163c
Showing with 5 additions and 5 deletions
app/controllers/confirmations_controller.rb
...@@ -14,12 +14,8 @@ class ConfirmationsController < Devise::ConfirmationsController ...@@ -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)
after_sign_in_path_for(resource)
else
new_session_path(resource_name) new_session_path(resource_name)
end end
end end
end
end end
changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml 0 → 100644
---
title: Disable automatic login after clicking email confirmation links
merge_request: 7472
author:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment