X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c436da861845723ab18f56dba96052cf2569e539..82b46502f25b6992c93bfe7689acc095aa447e5b:/services/api/app/controllers/arvados/v1/schema_controller.rb diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb index 3ac614d180..5d907b89ac 100644 --- a/services/api/app/controllers/arvados/v1/schema_controller.rb +++ b/services/api/app/controllers/arvados/v1/schema_controller.rb @@ -20,7 +20,7 @@ class Arvados::V1::SchemaController < ApplicationController description: "The API to interact with Arvados.", documentationLink: "http://doc.arvados.org/api/index.html", protocol: "rest", - baseUrl: root_url + "/arvados/v1/", + baseUrl: root_url + "arvados/v1/", basePath: "/arvados/v1/", rootUrl: root_url, servicePath: "arvados/v1/", @@ -73,7 +73,7 @@ class Arvados::V1::SchemaController < ApplicationController if Rails.application.config.websocket_address discovery[:websocketUrl] = Rails.application.config.websocket_address elsif ENV['ARVADOS_WEBSOCKETS'] - discovery[:websocketUrl] = (root_url.sub /^http/, 'ws') + "/websocket" + discovery[:websocketUrl] = (root_url.sub /^http/, 'ws') + "websocket" end ActiveRecord::Base.descendants.reject(&:abstract_class?).each do |k|