luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-19 03:37:04 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Claire 2022-10-31 08:37:32 +01:00
parent 5fd758fad1 26478f461c
commit 1fe4e5e38c
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/api/v1/timelines/tag_controller.rb
View file

@ -36,7 +36,6 @@ class Api::V1::Timelines::TagController < Api::BaseController
TagFeed.new(
@tag,
current_account,
locale: content_locale,
any: params[:any],
all: params[:all],
none: params[:none],

1
app/models/tag_feed.rb
View file

@ -34,7 +34,6 @@ class TagFeed < PublicFeed
scope.merge!(remote_only_scope) if remote_only?
scope.merge!(account_filters_scope) if account?
scope.merge!(media_only_scope) if media_only?
scope.merge!(language_scope)
scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
end