diff options
| author | Brian Neel <brian@gitlab.com> | 2016-11-15 04:30:12 +0300 |
|---|---|---|
| committer | Brian Neel <brian@gitlab.com> | 2016-12-31 18:58:08 +0300 |
| commit | 52867e15acacf842e26816c9143c59fc9086c6fb (patch) | |
| tree | 124932375c7b409cbb6acc2d5a23f5f97d500a6f /app/controllers/confirmations_controller.rb | |
| parent | 8dc2163ce580f1d71be1cf45e5dfcb2b4763d7bb (diff) | |
Disable automatic login feature when clicking on email confirmation links
Diffstat (limited to 'app/controllers/confirmations_controller.rb')
| -rw-r--r-- | app/controllers/confirmations_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
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 |