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
Léo-Paul Géneau
gitlab-ce
Commits
188b6f48
Commit
188b6f48
authored
Jul 16, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a better name for token.
parent
8968f6d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/models/user.rb
app/models/user.rb
+3
-3
No files found.
app/models/user.rb
View file @
188b6f48
...
...
@@ -241,12 +241,12 @@ class User < ActiveRecord::Base
end
def
generate_reset_token
@token
,
enc
=
Devise
.
token_generator
.
generate
(
self
.
class
,
:reset_password_token
)
@
reset_
token
,
enc
=
Devise
.
token_generator
.
generate
(
self
.
class
,
:reset_password_token
)
self
.
reset_password_token
=
enc
self
.
reset_password_sent_at
=
Time
.
now
.
utc
@token
@
reset_
token
end
def
namespace_uniq
...
...
@@ -497,7 +497,7 @@ class User < ActiveRecord::Base
def
post_create_hook
log_info
(
"User
\"
#{
self
.
name
}
\"
(
#{
self
.
email
}
) was created"
)
notification_service
.
new_user
(
self
,
@token
)
notification_service
.
new_user
(
self
,
@
reset_
token
)
system_hook_service
.
execute_hooks_for
(
self
,
:create
)
end
...
...
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