catstodon/app/controllers/api
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
2019-02-17 12:26:55 +01:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
v2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661) 2018-05-29 02:01:24 +02:00
web Sanitize and sandbox toot embeds (#9552) 2018-12-23 02:16:35 +01:00
base_controller.rb Add error message with invalid email confirmation (#9625) 2018-12-25 19:35:26 +01:00
oembed_controller.rb Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
push_controller.rb Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205) 2017-07-14 23:01:20 +02:00
salmon_controller.rb Fix response of signature_verification_failure_reason (#6441) 2018-02-08 05:00:45 +01:00
subscriptions_controller.rb HTTP signatures (#4146) 2017-07-14 20:41:49 +02:00