From 8f8a266743b7f0b729cf0178e2613fff7d0a9f80 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 6 Nov 2019 13:43:30 -0500 Subject: [PATCH] 15799: Ensure default baseURL has a trailing slash. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- apps/workbench/app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb index bd3afbb681..4fc7da9949 100644 --- a/apps/workbench/app/views/layouts/application.html.erb +++ b/apps/workbench/app/views/layouts/application.html.erb @@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0 %> <% if current_user %> <% content_for :js do %> - window.defaultSession = <%=raw({baseURL: Rails.configuration.Services.Controller.ExternalURL.to_s, token: Thread.current[:arvados_api_token], user: current_user}.to_json)%> + window.defaultSession = <%=raw({baseURL: Rails.configuration.Services.Controller.ExternalURL.to_s.gsub(/\/?$/,'/'), token: Thread.current[:arvados_api_token], user: current_user}.to_json)%> <% end %> <% end %> <% if current_user and $arvados_api_client.discovery[:websocketUrl] %> -- 2.30.2