diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-04 23:17:11 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-04 23:17:11 +0000 |
commit | c69a23ae4668bad91e3992dbd72e7b3a62427bf9 (patch) | |
tree | fc8e594f6f9ecc1dd5cb13c491aa17c372adb587 /app/models | |
parent | fc884d015a1a2d6c31976af3d63039390fa15939 (diff) | |
parent | d872902997c29e228001b71a4a3ede589e346f5d (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/user.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 231271f73..855ae908d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -126,18 +126,18 @@ class User < ApplicationRecord end def confirm - return if confirmed? + new_user = !confirmed? super - update_statistics! + update_statistics! if new_user end def confirm! - return if confirmed? + new_user = !confirmed? skip_confirmation! save! - update_statistics! + update_statistics! if new_user end def promote! |