[ARVADOS] updated: 1.3.0-2227-gae47f5fc8

Git user git at public.arvados.org
Wed Feb 26 18:49:56 UTC 2020


Summary of changes:
 apps/workbench/app/controllers/virtual_machines_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  ae47f5fc8d181bc26e96218286e8801a20bfe8d7 (commit)
      from  f26e039288e744510a6478b7b2597d3c494fb2d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ae47f5fc8d181bc26e96218286e8801a20bfe8d7
Author: Ward Vandewege <ward at jhvc.com>
Date:   Wed Feb 26 13:49:28 2020 -0500

    Fix web shell.
    
    refs #16203
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/apps/workbench/app/controllers/virtual_machines_controller.rb b/apps/workbench/app/controllers/virtual_machines_controller.rb
index 1427e3cc7..c74377314 100644
--- a/apps/workbench/app/controllers/virtual_machines_controller.rb
+++ b/apps/workbench/app/controllers/virtual_machines_controller.rb
@@ -25,8 +25,8 @@ class VirtualMachinesController < ApplicationController
   end
 
   def webshell
-    return render_not_found if Rails.configuration.Workbench.ShellInABoxURL == URI("")
-    webshell_url = URI(Rails.configuration.Workbench.ShellInABoxURL)
+    return render_not_found if Rails.configuration.Services.WebShell.ExternalURL == URI("")
+    webshell_url = URI(Rails.configuration.Services.WebShell.ExternalURL)
     if webshell_url.host.index("*") != nil
       webshell_url.host = webshell_url.host.sub("*", @object.hostname)
     else

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list