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
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
v2	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
web	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	2021-04-15 05:00:25 +02:00
base_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
oembed_controller_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00