summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-07-16 10:01:13 +0200
committerMarin Jankovski <marin@gitlab.com>2014-07-16 10:01:13 +0200
commit188b6f48d4a29a254f4d8c5b0c810729888df47c (patch)
tree64a74bb8488c7c7fdd84a5e426877b0d3112a372 /app/models/user.rb
parent8968f6d874171edc4a95027ac25d2cf83e8b7858 (diff)
downloadgitlab-ce-188b6f48d4a29a254f4d8c5b0c810729888df47c.tar.gz
Use a better name for token.
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 512df5d6408..15d6c028f06 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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