luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-06 12:37:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.
2022-02-09 17:28:33 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +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