[ARVADOS] updated: 4ec57503920f7cd47a48cb0d0cf089517b8d2dd3

[git at public.curoverse.com]

Summary of changes:
 .../app/views/users/_manage_ssh_keys.html.erb      | 16 ++++++---
 apps/workbench/config/application.yml.example      |  2 +-
 doc/install/install-api-server.html.textile.liquid |  6 ++--
 sdk/cli/bin/crunch-job                             | 15 ++++++++-
 services/api/config/application.default.yml        | 24 +++++++++++--
 services/api/config/application.yml.example        | 39 +++++-----------------
 6 files changed, 59 insertions(+), 43 deletions(-)

       via  4ec57503920f7cd47a48cb0d0cf089517b8d2dd3 (commit)
       via  0345bf3c3085c0bda41e3d3f45d2447e45165b65 (commit)
       via  fc5f7e25c2998c67e501e801b46a9237e20dbe83 (commit)
       via  0c967ad37496c13572bf09960540d2a06e95e51e (commit)
       via  d65a54bbef464dc47c095c4c03fb4b96d0f13304 (commit)
       via  bfb2ed548fb1334364b45db87692ba9e0885f862 (commit)
       via  26678170e7a981461f1676855358e52bf1d6bf72 (commit)
       via  b3eb8176f8d060b0e4652cae8e041c6bf2b7103e (commit)
       via  062a8bf0f9a1fe762c16749e7d0bcea77d1fbd73 (commit)
       via  ee4ac5896e121a73fbc1594e9c2611513f65e146 (commit)
       via  bcc6c7cb22b94c95c66721cc156bc8b8afbb86e9 (commit)
       via  7a8b20bd1613c22c7629aa84b0fff51b2434dcf7 (commit)
       via  774edf5b8449b4fc53dc4d1f1c00e32c15a20093 (commit)
       via  c7e1701d9b2a5704bd69ba78a7e59d90b6e556d6 (commit)
      from  18b51b1ff1f40f1c0467f1960b329c7bc317322d (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 4ec57503920f7cd47a48cb0d0cf089517b8d2dd3
Merge: 0345bf3 fc5f7e2
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 17:27:20 2014 -0400

    Merge branch 'master' into 3193-manage-account


commit 0345bf3c3085c0bda41e3d3f45d2447e45165b65
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 17:26:40 2014 -0400

    3193: add horizontal scroll to ssh key

diff --git a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
index 5fcdd0e..3612d1d 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -9,10 +9,10 @@
   <% end %>
 
   <% if @my_ssh_keys.andand.any? %>
-    <table class="table virtual-machines-table" style="table-layout:fixed; overflow:hidden; white-space: nowrap;">
+    <table class="table manage-ssh-keys-table" style="table-layout:fixed; overflow:hidden; white-space: nowrap;">
       <colgroup>
-        <col style="width: 30%" />
-        <col style="width: 65%" />
+        <col style="width: 40%" />
+        <col style="width: 55%" />
         <col style="width: 5%" />
       </colgroup>
       <thead>
@@ -28,8 +28,14 @@
             <td style="width:50px; overflow:hidden;">
               <%= key[:name] %>
             </td>
-            <td style="width:100px; overflow:hidden;">
-              <%= key[:public_key] %>
+            <td>
+              <% if key[:public_key] && key[:public_key].size > 0 %>
+                <div>
+                  <pre style="margin:0; overflow-x:scroll"> <%= key[:public_key] %> </pre>
+                </div>
+              <% else %>
+                  <%= key[:public_key] %>
+              <% end %>
             </td>
             <td>
               <%= link_to(authorized_key_path(id: key[:uuid]), method: 'delete', class: 'btn btn-sm', data: {confirm: "Really delete key?"}) do %>

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


hooks/post-receive
--