[ARVADOS] created: 1.3.0-1833-g8f8a26674

[Git user]

        at  8f8a266743b7f0b729cf0178e2613fff7d0a9f80 (commit)


commit 8f8a266743b7f0b729cf0178e2613fff7d0a9f80
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Nov 6 13:43:30 2019 -0500

    15799: Ensure default baseURL has a trailing slash.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index bd3afbb68..4fc7da994 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 %>
   <meta name="author" content="">
   <% 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] %>

-----------------------------------------------------------------------


hooks/post-receive
--