mastodon/app/controllers/api
Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
2020-04-05 18:32:06 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
v2 Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
web Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
base_controller.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00
proofs_controller.rb Fix proofs API being inaccessible in secure mode (#12495) 2019-11-28 04:07:49 +01:00