diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-11 09:37:48 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-11 09:37:48 +0200 |
| commit | 5fd8780b1429acd2bea908695e13c41375d189d7 (patch) | |
| tree | c870d368c2a9d0bfd2176057c0b99dad48338248 /app/controllers/tags_controller.rb | |
| parent | e8b8ac8908c6623f0fd7ffccc7de3882a773b72f (diff) | |
| parent | 95555f15b55291b97477465f8d8a7eba526d6522 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.
Diffstat (limited to 'app/controllers/tags_controller.rb')
| -rw-r--r-- | app/controllers/tags_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 64736e77f..46821a200 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -27,7 +27,6 @@ class TagsController < ApplicationController format.rss do expires_in 0, public: true - render xml: RSS::TagSerializer.render(@tag, @statuses) end format.json do |