Merge branch 'master' into glitch-soc/merge-upstream

2018-11-29 19:22:52 +01:00
parent 6a264c9379 fa9f28f52d
commit ad7a3974cc
9 changed files with 73 additions and 52 deletions
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@ -18,7 +18,7 @@ class InstancePresenter
  end

  def user_count
-    Rails.cache.fetch('user_count') { User.confirmed.count }
+    Rails.cache.fetch('user_count') { User.confirmed.joins(:account).merge(Account.without_suspended).count }
  end

  def status_count