luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.
2022-11-10 09:36:47 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
web
base_controller.rb Change AUTHORIZED_FETCH to not block unauthenticated REST API access (#19803) 2022-11-05 22:56:03 +01:00
oembed_controller.rb