mirrors/mastodon
1
0
Fork 1
mirror of https://github.com/glitch-soc/mastodon synced 2025-09-04 18:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
mastodon/spec/controllers/api
History
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35:55 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
v2 Move V2 Filter methods under /api/v2 prefix (#20622) 2022-11-14 08:34:07 +01: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