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

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

2019-03-05 19:23:16 +01:00

..

v1

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

2019-03-05 19:23:16 +01: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

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

…

salmon_controller.rb

Fix response of signature_verification_failure_reason (#6441)

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

subscriptions_controller.rb

…