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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
196df264
Commit
196df264
authored
Oct 24, 2017
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix to pass static-analysis
parent
57a27579
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/controllers/confirmations_controller.rb
app/controllers/confirmations_controller.rb
+2
-2
No files found.
app/controllers/confirmations_controller.rb
View file @
196df264
...
@@ -10,12 +10,12 @@ class ConfirmationsController < Devise::ConfirmationsController
...
@@ -10,12 +10,12 @@ class ConfirmationsController < Devise::ConfirmationsController
users_almost_there_path
users_almost_there_path
end
end
def
after_confirmation_path_for
(
_
resource_name
,
resource
)
def
after_confirmation_path_for
(
resource_name
,
resource
)
# incoming resource can either be a :user or an :email
# incoming resource can either be a :user or an :email
if
signed_in?
(
:user
)
if
signed_in?
(
:user
)
after_sign_in
(
resource
)
after_sign_in
(
resource
)
else
else
username
=
(
_
resource_name
==
:email
?
resource
.
user
.
username
:
resource
.
username
)
username
=
(
resource_name
==
:email
?
resource
.
user
.
username
:
resource
.
username
)
Gitlab
::
AppLogger
.
info
(
"Email Confirmed: username=
#{
username
}
email=
#{
resource
.
email
}
ip=
#{
request
.
remote_ip
}
"
)
Gitlab
::
AppLogger
.
info
(
"Email Confirmed: username=
#{
username
}
email=
#{
resource
.
email
}
ip=
#{
request
.
remote_ip
}
"
)
flash
[
:notice
]
+=
" Please sign in."
flash
[
:notice
]
+=
" Please sign in."
new_session_path
(
:user
)
new_session_path
(
:user
)
...
...
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