Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
52867e15
Commit
52867e15
authored
Nov 14, 2016
by
Brian Neel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable automatic login feature when clicking on email confirmation links
parent
8dc2163c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
app/controllers/confirmations_controller.rb
app/controllers/confirmations_controller.rb
+2
-6
changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml
...eleased/disable-autologin-on-email-confirmation-links.yml
+4
-0
No files found.
app/controllers/confirmations_controller.rb
View file @
52867e15
...
...
@@ -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
changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml
0 → 100644
View file @
52867e15
---
title
:
Disable automatic login after clicking email confirmation links
merge_request
:
7472
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment