root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Disable automatic login feature when clicking on email confirmation links

This commit is contained in:
Brian Neel 2016-11-14 20:30:12 -05:00
parent 8dc2163ce5
commit 52867e15ac
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/confirmations_controller.rb
View File

@ -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) new_session_path(resource_name)
after_sign_in_path_for(resource)
else
new_session_path(resource_name)
end
end end
end end
end end

4
changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Disable automatic login after clicking email confirmation links
merge_request: 7472
author: