[ARVADOS] updated: 8d0355a42caf66f40fe3007a43dc2c8b88712083

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |  2 +-
 apps/workbench/Gemfile.lock                        | 78 +++++++++++-----------
 .../app/controllers/actions_controller.rb          |  5 +-
 .../views/users/_manage_virtual_machines.html.erb  |  6 +-
 doc/install/install-api-server.html.textile.liquid | 30 +++++----
 ...l-manual-prerequisites-ruby.html.textile.liquid | 14 ++--
 sdk/pam/arvados_pam.py                             |  5 +-
 sdk/python/tests/run_test_server.py                |  9 ++-
 sdk/python/tests/test_arv_put.py                   |  2 +-
 .../app/controllers/user_sessions_controller.rb    |  4 +-
 .../api/app/views/static/login_failure.html.erb    |  2 +-
 services/api/config/application.default.yml        |  9 +++
 services/api/config/application.yml.example        |  3 +
 services/api/config/database.yml.sample            |  3 +
 services/api/config/initializers/load_config.rb    | 16 +++++
 .../api/config/initializers/omniauth.rb.example    | 13 ----
 services/api/config/initializers/omniauth_init.rb  | 19 ++++++
 services/fuse/setup.py                             |  2 +-
 18 files changed, 135 insertions(+), 87 deletions(-)
 delete mode 100644 services/api/config/initializers/omniauth.rb.example
 create mode 100644 services/api/config/initializers/omniauth_init.rb

       via  8d0355a42caf66f40fe3007a43dc2c8b88712083 (commit)
       via  4e416c9872af5237494958d1bacd33eb17821732 (commit)
       via  4f77c7788c6fc3a6cc9cd90ff231d837fdec7cc4 (commit)
       via  e76418b037477b700037652bec9dcba98839e14b (commit)
       via  99c4b804af44311d95e0b0ab72521471a1166347 (commit)
       via  2ecf7efbab5ceb082739dcffd98c18bb4b14447e (commit)
       via  9fbb2bbd4e2a0f1d15e1db3f3d606cdedae825a7 (commit)
       via  e56ea5c6c9244d2baaef9a24efc5eaad5bdf290c (commit)
       via  71ba12ca158c39c17187f15c26279ec00d461dc5 (commit)
       via  85de04ad9268e45bad459a606bfabfca4f6fad8c (commit)
       via  158b18f036fc5f3f5848390d7ef53c6493aeb5a9 (commit)
       via  acfbb64831047dcae895e57ceff3d0a834c91bf2 (commit)
       via  734a66939892064fe9c663fd746cb7371c7d84e4 (commit)
      from  484f12ee2767535a87272c3899967c29b1e13651 (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 8d0355a42caf66f40fe3007a43dc2c8b88712083
Merge: 4e416c9 4f77c77
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 8 20:26:23 2015 -0400

    Merge branch 'master' into 6279-web-shell-client


commit 4e416c9872af5237494958d1bacd33eb17821732
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 8 20:25:51 2015 -0400

    6279: if hostname ends with .shell, strip it.

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 77abb63..f1985a6 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -230,10 +230,13 @@ You can try recreating the collection to get a copy with full provenance data."
 
   expose_action :webshell do
     shell_in_a_box_url_config = Rails.configuration.shell_in_a_box_url
+
     return render_not_found if not shell_in_a_box_url_config
 
+    return unprocessable "Missing parameters" if not params['login'] or not params['hostname']
+
     @webshell_login = params['login']
-    @webshell_hostname = params['hostname']
+    @webshell_hostname = params['hostname'].chomp('.shell')
 
     if not shell_in_a_box_url_config.end_with?('/')
       shell_in_a_box_url_config += '/'
diff --git a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
index f3756ac..75e7d15 100644
--- a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
@@ -86,7 +86,11 @@
             </td>
             <td>
               <% if  Rails.configuration.shell_in_a_box_url %>
-                <%= link_to 'Login', webshell_path(login: @my_vm_logins[vm[:uuid]].first, hostname: vm[:hostname], vm_uuid: vm[:uuid]) %>
+                <% if @my_vm_logins[vm[:uuid]] %>
+                  <% @my_vm_logins[vm[:uuid]].each do |login| %>
+                    <%= link_to 'Login', webshell_path(login: login, hostname: vm[:hostname]) %>
+                  <% end %>
+                <% end %>
               <% end %>
             </td>
           </tr>

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


hooks/post-receive
--