Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-04 23:17:11 +00:00
parent fc884d015a d872902997
commit c69a23ae46
29 changed files with 246 additions and 159 deletions
--- 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!