gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-12-07 06:44:04 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
61ef81c548
mastodon/app/controllers/api
History
Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.
2022-01-23 18:24:01 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
web Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +02:00
base_controller.rb Add logging of S3-related errors (#16381) 2021-07-21 18:34:39 +02:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00