Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby

This commit is contained in:
Brian Smith 2012-11-22 03:27:50 -05:00
commit 55c9c1f200
1 changed files with 5 additions and 1 deletions

View File

@ -117,6 +117,10 @@ module JamRuby
def following_count
return self.followings.size + self.band_followings.size
end
def confirm_email!
self.email_confirmed = true
end
def favorite_count
return self.favorites.size
@ -338,7 +342,7 @@ module JamRuby
# throws ActiveRecord::RecordNotFound if invalid
user = User.find_by_signup_token!(signup_token)
user.signup_token = nil
user.email_confirmed = true
user.confirm_email!
user.save
return user
end