mastodon-glitch/app/controllers/api
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
web Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
base_controller.rb Change CSP directives on API to be tight and concise (#20960) 2022-12-15 16:40:32 +01:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00