Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
account_relationships_presenter_spec.rb	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
familiar_followers_presenter_spec.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	2022-03-07 09:36:47 +01:00
instance_presenter_spec.rb	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	2021-07-13 15:46:20 +02:00
status_relationships_presenter_spec.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00