about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorIkUrA <hawaiianphoto@geekhost.net>2017-06-05 23:37:44 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-06-05 16:37:44 +0200
commitfacd90e7a68d0390005b7bf37bfc88431ef11af6 (patch)
treef557fafda113f5f213f880756561d9393bd5e394 /app
parent6201f96b8a49d58b5b2d73fac9fa1fa93f5890ed (diff)
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
Diffstat (limited to 'app')
-rw-r--r--app/views/api/v1/instances/show.rabl3
1 files changed, 3 insertions, 0 deletions
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