Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`
This commit is contained in:
5
app/serializers/rest/trends/link_serializer.rb
Normal file
5
app/serializers/rest/trends/link_serializer.rb
Normal file
@@ -0,0 +1,5 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class REST::Trends::LinkSerializer < REST::PreviewCardSerializer
|
||||
attributes :history
|
||||
end
|
||||
Reference in New Issue
Block a user