diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-11 12:14:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-11 12:14:29 +0200 |
| commit | 32762f2fa864d8f56dfba59e8b5ff6ccf03aecb6 (patch) | |
| tree | d7143f63d6fc7d0d6d817d61f2fcc335fe4aba7a /app/controllers/accounts_controller.rb | |
| parent | e8b8ac8908c6623f0fd7ffccc7de3882a773b72f (diff) | |
| parent | 6fb837aa1d34fbafda1fe561d1a3789ac281d27c (diff) | |
Merge pull request #1767 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/accounts_controller.rb')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 03c07c50b..9949206cb 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -45,7 +45,6 @@ class AccountsController < ApplicationController limit = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE @statuses = filtered_statuses.without_reblogs.limit(limit) @statuses = cache_collection(@statuses, Status) - render xml: RSS::AccountSerializer.render(@account, @statuses, params[:tag]) end format.json do |