]> cat aescling's git repositories - mastodon.git/commitdiff
Add streaming_api_base_url to /api/v1/instance (#3556)
authorIkUrA <hawaiianphoto@geekhost.net>
Mon, 5 Jun 2017 14:37:44 +0000 (23:37 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 5 Jun 2017 14:37:44 +0000 (16:37 +0200)
* Add streaming_api_base_url to /api/v1/instance

* Adjust spaces

* nested view

* re-adjust spaces

app/views/api/v1/instances/show.rabl

index 313aabb0b9c04c05ef2be4901eb8c68c7c5e37c6..05fb650315ae813cc94a5b9ef4afa848426d5bba 100644 (file)
@@ -5,3 +5,6 @@ node(:title)       { Setting.site_title }
 node(:description) { Setting.site_description }
 node(:email)       { Setting.site_contact_email }
 node(:version)     { Mastodon::Version.to_s }
+node :urls do
+    { :streaming_api => Rails.configuration.x.streaming_api_base_url }
+end