mastodon/spec/controllers/api
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
..
v1 Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
web Keep WebPush settings (#5879) 2017-12-09 02:31:37 +01:00
base_controller_spec.rb Fix webfinger retries (#4275) 2017-07-20 01:59:07 +02:00
oembed_controller_spec.rb Raise an error for remote url in StatusFinder (#4776) 2017-09-02 17:42:47 +02:00
push_controller_spec.rb Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205) 2017-07-14 23:01:20 +02:00
salmon_controller_spec.rb Fix response of signature_verification_failure_reason (#6441) 2018-02-08 05:00:45 +01:00
subscriptions_controller_spec.rb Hook up URL-based resource look-up to ActivityPub (#4589) 2017-08-14 02:29:36 +02:00