[ARVADOS] updated: f595e7b488f1056e3698ca01f6c1e715ce63929f

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/projects_controller.rb         | 26 ++++++++++++++++++++++
 .../workbench/app/views/application/_choose.js.erb |  1 +
 .../app/views/projects/_show_tab_contents.html.erb | 13 +++++++++++
 .../app/views/users/_manage_ssh_keys.html.erb      |  6 ++---
 .../app/views/users/_setup_popup.html.erb          |  2 +-
 apps/workbench/config/routes.rb                    |  1 +
 6 files changed, 45 insertions(+), 4 deletions(-)

       via  f595e7b488f1056e3698ca01f6c1e715ce63929f (commit)
       via  38c87cca0040ecaa6b3aabeaacf9151f8712f0d3 (commit)
       via  cf6de2801c7e467230941cfee1d9227cc9932d7e (commit)
       via  61ce85085a98514a5e694fa40b46f4eb432d55f5 (commit)
       via  bf52e46b544bf4c63d36cc824ed640d20a823686 (commit)
       via  89158222661a806cd27299054f6f50ee906d92e1 (commit)
       via  224c45d3c600e879626c675247da7612f0c95891 (commit)
       via  5d834e3837b2afc830c79f75e121a524d93806c0 (commit)
       via  136c0dd03fd3df62c2f9d47d29481bc68c9c1333 (commit)
       via  f879aadfdf3b53036069dc40116188ae5077810e (commit)
       via  51f86fd25a6176617a29b43c33195c09520e0824 (commit)
       via  00a889dfb11bd9d4edf3d18d66d9b29b69cbde77 (commit)
       via  2ff5d889c8d169a85781d13edcf7988fb94cc248 (commit)
       via  aab0e7a008eecb0e3dff1e2351b3ffab3f487ebc (commit)
       via  d0472c2cdefecde7e484e51f069b5e6339ae4de5 (commit)
       via  4890341c4536ed13770f4313b37dc8202da3b54c (commit)
       via  cef70f92c560353b8800affba9211382b7920815 (commit)
       via  ad4fcf639b3a75ddd40aeb659b090c9037d3507e (commit)
       via  27e6fc598e6a86e20b6abb2badde3a3b888a44fa (commit)
       via  fd2bc65117ee362ccd1c675947d1b941863b7cf7 (commit)
      from  9a07feb6e747e88e4bd3f43e2c2b77954b9e6a19 (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 f595e7b488f1056e3698ca01f6c1e715ce63929f
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 16:33:32 2014 -0400

    3193: minor ui updates

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 c8a68a8..5fcdd0e 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -11,8 +11,8 @@
   <% if @my_ssh_keys.andand.any? %>
     <table class="table virtual-machines-table" style="table-layout:fixed; overflow:hidden; white-space: nowrap;">
       <colgroup>
-        <col style="width: 15%" />
-        <col style="width: 80%" />
+        <col style="width: 30%" />
+        <col style="width: 65%" />
         <col style="width: 5%" />
       </colgroup>
       <thead>
@@ -32,7 +32,7 @@
               <%= key[:public_key] %>
             </td>
             <td>
-              <%= link_to(authorized_key_path(id: key[:uuid]), method: 'delete', class: 'btn btn-sm', data: {confirm: "Really delete key"}) do %>
+              <%= link_to(authorized_key_path(id: key[:uuid]), method: 'delete', class: 'btn btn-sm', data: {confirm: "Really delete key?"}) do %>
                   <i class="fa fa-fw fa-trash-o"></i>
               <% end %>
             </td>

commit 38c87cca0040ecaa6b3aabeaacf9151f8712f0d3
Merge: 61ce850 cf6de28
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 16:13:34 2014 -0400

    Merge branch 'master' into 3193-manage-account


commit 61ce85085a98514a5e694fa40b46f4eb432d55f5
Merge: 5d834e3 9a07feb
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 16:04:42 2014 -0400

    Merge branch '3193-manage-account' of git.curoverse.com:arvados into 3193-manage-account


commit 5d834e3837b2afc830c79f75e121a524d93806c0
Merge: fc68ff8 f879aad
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 15:29:35 2014 -0400

    Merge branch 'master' into 3193-manage-account


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


hooks/post-receive
--