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

2022-10-31 08:37:32 +01:00 · 2022-10-31 08:37:32 +01:00 · 4a8b813a1f
parent 96bd245f04 fdfe1eae4a
commit 4a8b813a1f
2 changed files with 0 additions and 2 deletions
--- 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],
--- 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