logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: facd90e7a68d0390005b7bf37bfc88431ef11af6
parent: 6201f96b8a49d58b5b2d73fac9fa1fa93f5890ed
Author: IkUrA <hawaiianphoto@geekhost.net>
Date:   Mon,  5 Jun 2017 23:37:44 +0900

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:

Mapp/views/api/v1/instances/show.rabl3+++
1 file changed, 3 insertions(+), 0 deletions(-)

diff --git 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