[ARVADOS] updated: 1.3.0-3056-gb6462cf67

[Git user]

Summary of changes:
 .../app/views/virtual_machines/webshell.html.erb   | 42 +++++++++++++----
 apps/workbench/config/initializers/assets.rb       |  2 +-
 .../assets/javascripts}/webshell/shell_in_a_box.js | 52 +++++++++++-----------
 .../assets/stylesheets}/webshell/styles.css        | 38 +++++++++-------
 4 files changed, 83 insertions(+), 51 deletions(-)
 rename apps/workbench/{public => lib/assets/javascripts}/webshell/shell_in_a_box.js (99%)
 rename apps/workbench/{public => lib/assets/stylesheets}/webshell/styles.css (93%)

       via  b6462cf67d9c3a0d9eb6d2d6997b2a88ece8ad6c (commit)
       via  98db65de63c9e2acfeae6636ccc619171635bda0 (commit)
       via  83d9f52a85cd19e9821d54b3d6ec9efdff337777 (commit)
      from  8a17791b5f16b785eeaff86051dbcce84699ceac (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 b6462cf67d9c3a0d9eb6d2d6997b2a88ece8ad6c
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Sep 1 22:40:57 2020 -0400

    16796: Expect password prompt
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/apps/workbench/app/views/virtual_machines/webshell.html.erb b/apps/workbench/app/views/virtual_machines/webshell.html.erb
index 89c7c2bb8..735583fae 100644
--- a/apps/workbench/app/views/virtual_machines/webshell.html.erb
+++ b/apps/workbench/app/views/virtual_machines/webshell.html.erb
@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
         var trySendToken = function() {
           // change this text when PAM is reconfigured to present a
           // password prompt that we can wait for.
-          if (findText("login:")) {
+          if (findText("assword:")) {
              sh.keysPressed("<%= j Thread.current[:arvados_api_token] %>\n");
              sh.vt100('(sent authentication token)\n');
           } else {
@@ -57,7 +57,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
             sh.keysPressed("<%= j params[:login] %>\n");
             // Make this wait shorter when PAM is reconfigured to
             // present a password prompt that we can wait for.
-            setTimeout(trySendToken, 3000);
+            setTimeout(trySendToken, 200);
           } else {
             setTimeout(trySendLogin, 200);
           }

commit 98db65de63c9e2acfeae6636ccc619171635bda0
Merge: 8a17791b5 83d9f52a8
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Sep 1 22:30:17 2020 -0400

    Merge branch '16773-webshell-js' into 16796-arvbox-webshell
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


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


hooks/post-receive
--