Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

v1

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-04 16:37:26 +02:00

v2

Add type, limit, offset, min_id, max_id, account_id to search API (#10091)

2019-02-26 15:21:36 +01:00

web

Sanitize and sandbox toot embeds (#9552)

2018-12-23 02:16:35 +01:00

base_controller.rb

Explicitly disable storage of REST API results (#10655)

2019-05-03 20:39:19 +02:00

oembed_controller.rb

Update status embeds (#4742)

2017-08-30 10:23:43 +02:00

proofs_controller.rb

Add Keybase integration (#10297)

2019-03-18 21:00:55 +01:00

push_controller.rb

…

salmon_controller.rb

Fix response of signature_verification_failure_reason (#6441)

2018-02-08 05:00:45 +01:00

subscriptions_controller.rb

…