Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/trends/links/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/links/preview_card_providers/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/statuses/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/tags/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes.		2022-03-02 20:48:27 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 20:48:27 +01:00
fabricators
features
fixtures
helpers
lib
mailers
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
policies
presenters
requests
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	2017-06-10 09:39:26 +02:00
serializers/activitypub
services
support
validators
views
workers
rails_helper.rb
spec_helper.rb