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

2018-04-03 19:17:20 +00:00
parent 1f5bdd8445 d8d4217959
commit 6611100480
70 changed files with 924 additions and 271 deletions
@@ -86,7 +86,7 @@ module Admin::ActionLogsHelper
      opposite_verbs?(log) ? 'negative' : 'positive'
    when :update, :reset_password, :disable_2fa, :memorialize
      'neutral'
-    when :demote, :silence, :disable, :suspend
+    when :demote, :silence, :disable, :suspend, :remove_avatar, :reopen
      'negative'
    when :destroy
      opposite_verbs?(log) ? 'positive' : 'negative'