about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-10-31 08:37:32 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-10-31 08:37:32 +0100
commit1fe4e5e38c17a726e6aea5d6033139653e89a379 (patch)
tree910675cc3b8d9022f65bcfa9bee1acee6af8d0e4
parent5fd758fad18830e9e4b7baeccd87977397cf824a (diff)
parent26478f461cafc42d39bc0baf235989e1df7ee0bb (diff)
Merge branch 'main' into glitch-soc/merge-upstream
-rw-r--r--app/controllers/api/v1/timelines/tag_controller.rb1
-rw-r--r--app/models/tag_feed.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 9f3a5b3f1..64a1db58d 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -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],
diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb
index 64d48ea72..761a43bb1 100644
--- a/app/models/tag_feed.rb
+++ b/app/models/tag_feed.rb
@@ -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