diff options
| author | pluralcafe-docker <git@plural.cafe> | 2019-01-21 04:35:41 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2019-01-21 04:35:41 +0000 |
| commit | 657438e95054ba1f161db698acdf7f1a871d1c9c (patch) | |
| tree | a3344b6105b7771983f69c789fb2f7a0c22a8583 /app/controllers | |
| parent | d899138556513c8a5fa3397606ecc4752b7c6785 (diff) | |
| parent | b7c67605d5c2110b4a3cd3d8a7b8ef2878cbfe48 (diff) | |
Merge branch 'master' into production
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/tags_controller.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb index 4315b0283..6851099f6 100644 --- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb +++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb @@ -25,7 +25,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController end def paginated_statuses - Status.where(reblog_of_id: @status.id).paginate_by_max_id( + Status.where(reblog_of_id: @status.id).where(visibility: [:public, :unlisted]).paginate_by_max_id( limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id] diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index d06f4e070..186d276c2 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -3,6 +3,8 @@ class TagsController < ApplicationController PAGE_SIZE = 20 + layout 'public' + before_action :set_body_classes before_action :set_instance_presenter |