nyastodon/spec/controllers/api
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
..
v1 Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09: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