diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-29 21:47:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 21:47:18 +0100 |
| commit | b65daa25faab0fbefd367b3cbbe4d32bfd8c5820 (patch) | |
| tree | 4ec696e3bfd7406b0fbe54f71aed649241663ecf /app/presenters | |
| parent | 6a264c9379a50cb94afc8dd369bfc5b626a9c4d1 (diff) | |
| parent | ad7a3974cc48946b5cb8182da4f9e236aa5e39a1 (diff) | |
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/instance_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb index b0756d1f4..d8670f124 100644 --- 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 |