diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-08 19:05:02 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-08 19:05:02 -0500 |
| commit | 67e77f230e93b2e2ac05632a7cccdb5f26537f3b (patch) | |
| tree | 6fd9801a67dc1576e5711177fdeeac04f2622098 /app/controllers/admin/statuses_controller.rb | |
| parent | 695b53b796767e307d8ce0f5d11c2a82cb85bfd5 (diff) | |
| parent | 0893b1669548858daee79ab1260fb98646a0b3fa (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.
Diffstat (limited to 'app/controllers/admin/statuses_controller.rb')
| -rw-r--r-- | app/controllers/admin/statuses_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index 5d4325f57..d5787acfb 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -12,7 +12,7 @@ module Admin def index authorize :status, :index? - @statuses = @account.statuses + @statuses = @account.statuses.where(visibility: [:public, :unlisted]) if params[:media] account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).distinct |