From: IkUrA <hawaiianphoto@geekhost.net>
Date: Mon, 5 Jun 2017 14:37:44 +0000 (+0900)
Subject: Add streaming_api_base_url to /api/v1/instance (#3556)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=facd90e7a68d0390005b7bf37bfc88431ef11af6;p=mastodon.git

Add streaming_api_base_url to /api/v1/instance (#3556)

* Add streaming_api_base_url to /api/v1/instance

* Adjust spaces

* nested view

* re-adjust spaces
---

diff --git a/app/views/api/v1/instances/show.rabl b/app/views/api/v1/instances/show.rabl
index 313aabb0b..05fb65031 100644
--- a/app/views/api/v1/instances/show.rabl
+++ b/app/views/api/v1/instances/show.rabl
@@ -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