[ARVADOS] updated: c5e726ce0161166fcdac2eeda5e9939926152b7a

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb | 3 ++-
 apps/workbench/public/shell_in_a_box.js              | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  c5e726ce0161166fcdac2eeda5e9939926152b7a (commit)
      from  1d73050943da34f9983c7b71eb9cd76a1f0aed5e (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 c5e726ce0161166fcdac2eeda5e9939926152b7a
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 8 21:37:11 2015 -0400

    6279: add some comments

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index f1985a6..ef7723e 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -228,6 +228,7 @@ You can try recreating the collection to get a copy with full provenance data."
     end
   end
 
+  # webshell action is used to login to an arvados shell using workbench
   expose_action :webshell do
     shell_in_a_box_url_config = Rails.configuration.shell_in_a_box_url
 
@@ -241,7 +242,7 @@ You can try recreating the collection to get a copy with full provenance data."
     if not shell_in_a_box_url_config.end_with?('/')
       shell_in_a_box_url_config += '/'
     end
-    @webshell_url = shell_in_a_box_url_config + @webshell_hostname + '/'
+    @webshell_url = shell_in_a_box_url_config + @webshell_hostname
 
     respond_to do |format|
       render partial: 'virtual_machines/webshell'
diff --git a/apps/workbench/public/shell_in_a_box.js b/apps/workbench/public/shell_in_a_box.js
index 111126c..115cc74 100644
--- a/apps/workbench/public/shell_in_a_box.js
+++ b/apps/workbench/public/shell_in_a_box.js
@@ -1,3 +1,6 @@
+// This file contains code from shell_in_a_box.js and vt100.js
+
+
 // ShellInABox.js -- Use XMLHttpRequest to provide an AJAX terminal emulator.
 // Copyright (C) 2008-2010 Markus Gutschke <markus at shellinabox.com>
 //

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


hooks/post-receive
--