diff options
| author | Marin Jankovski <marin@gitlab.com> | 2017-01-24 10:06:57 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2017-01-24 10:06:57 +0000 |
| commit | 58786a7a41b36e84dda91cdca04671b6e613974d (patch) | |
| tree | fe678c42817402ec7a76b53ab7c494b989f9cc6b | |
| parent | b60de9c0fd90c310d2a4146f75b67f9f360cbd6c (diff) | |
| parent | 52867e15acacf842e26816c9143c59fc9086c6fb (diff) | |
| download | gitlab-ce-58786a7a41b36e84dda91cdca04671b6e613974d.tar.gz | |
Merge branch 'disable-automatic-login-on-email-confirmation' into 'master'
Disable automatic login feature when clicking on email confirmation links
See merge request !7472
| -rw-r--r-- | app/controllers/confirmations_controller.rb | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml | 4 |
2 files changed, 6 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 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: |