David Yip ed490b781f

Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	Gemfile.lock
 	config/application.rb

2018-04-13 16:36:46 -05:00

..

v1

Merge remote-tracking branch 'tootsuite/master'

2018-04-12 03:30:57 -05:00

web

Upgrade Rails to version 5.2.0 (#5898)

2018-04-12 14:45:17 +02:00

base_controller.rb

Ensure that boolean params in the API are parsed for truthiness (#6575)

2018-03-01 02:47:59 +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