Merge tag 'v2.7.0' into instance_only_statuses

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]

app/controllers/directories_controller.rb

@@ -28,7 +28,7 @@ class DirectoriesController < ApplicationController
   end
 
   def set_tags
-    @tags = Tag.discoverable.limit(30)
+    @tags = Tag.discoverable.limit(30).reject { |tag| tag.cached_sample_accounts.empty? }
   end
 
   def set_accounts

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