diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-31 18:25:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 18:25:34 +0100 |
| commit | 968f34300681d8082cf2f824722a3945fc604b2d (patch) | |
| tree | 910675cc3b8d9022f65bcfa9bee1acee6af8d0e4 /app/controllers/api/v1/timelines/public_controller.rb | |
| parent | 371563b0e249b6369e04709fb974a8e57413529f (diff) | |
| parent | 1fe4e5e38c17a726e6aea5d6033139653e89a379 (diff) | |
Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/timelines/public_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index 493fe4776..2ee5aaf18 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -35,6 +35,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController def public_feed PublicFeed.new( current_account, + locale: content_locale, local: truthy_param?(:local), remote: truthy_param?(:remote), only_media: truthy_param?(:only_media), |