[ARVADOS] updated: 288ea0d2e35bf94d8a9f0bc609bac1467c1c5b9e

[git at public.curoverse.com]

Summary of changes:
 .../app/views/users/_show_activity.html.erb        |    2 +-
 apps/workbench/app/views/users/storage.html.erb    |   12 +-
 .../api/app/controllers/api_clients_controller.rb  |    2 -
 .../api/app/controllers/application_controller.rb  |   15 ++-
 .../api/app/controllers/collections_controller.rb  |    2 -
 .../app/controllers/commit_ancestors_controller.rb |    2 -
 services/api/app/controllers/commits_controller.rb |    2 -
 services/api/app/controllers/nodes_controller.rb   |   30 ----
 .../controllers/pipeline_instances_controller.rb   |    2 -
 services/api/app/controllers/users_controller.rb   |    2 -
 services/api/app/models/pipeline_instance.rb       |    2 +-
 services/api/config/application.rb                 |    2 +
 services/api/config/routes.rb                      |  160 ++++++--------------
 services/api/test/fixtures/pipeline_instances.yml  |   19 +++-
 .../api/test/functional/admin_notifier_test.rb     |    7 -
 .../arvados/v1/collections_controller_test.rb      |    6 +-
 .../arvados/v1/keep_disks_controller_test.rb       |    2 +-
 .../functional/arvados/v1/nodes_controller_test.rb |    4 +-
 .../functional/arvados/v1/users_controller_test.rb |   10 +-
 .../functional/commit_ancestors_controller_test.rb |    7 -
 .../api/test/functional/commits_controller_test.rb |    7 -
 services/api/test/functional/user_notifier_test.rb |    7 -
 .../api/test/integration/collections_api_test.rb   |   36 +++++
 services/api/test/integration/errors_test.rb       |   27 ++++
 services/api/test/unit/pipeline_instance_test.rb   |   36 +++--
 25 files changed, 184 insertions(+), 219 deletions(-)
 delete mode 100644 services/api/app/controllers/api_clients_controller.rb
 delete mode 100644 services/api/app/controllers/collections_controller.rb
 delete mode 100644 services/api/app/controllers/commit_ancestors_controller.rb
 delete mode 100644 services/api/app/controllers/commits_controller.rb
 delete mode 100644 services/api/app/controllers/nodes_controller.rb
 delete mode 100644 services/api/app/controllers/pipeline_instances_controller.rb
 delete mode 100644 services/api/app/controllers/users_controller.rb
 delete mode 100644 services/api/test/functional/admin_notifier_test.rb
 delete mode 100644 services/api/test/functional/commit_ancestors_controller_test.rb
 delete mode 100644 services/api/test/functional/commits_controller_test.rb
 delete mode 100644 services/api/test/functional/user_notifier_test.rb
 create mode 100644 services/api/test/integration/errors_test.rb

       via  288ea0d2e35bf94d8a9f0bc609bac1467c1c5b9e (commit)
       via  1ba54c139354125459f3a25ad7a2894a02c7d1f4 (commit)
       via  660ebe707d2f7c28648b38ff9be826622fbefd39 (commit)
       via  41863948b43264bbd09358d145177a7fadd864cf (commit)
       via  725b9459d878b11d8d45fa12c99a06b400171574 (commit)
       via  b6a0ff1443bb40b52df7b30fd269aa6f05591b31 (commit)
      from  4aef6531076e8c9d00252050d0757b32a22519c1 (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 288ea0d2e35bf94d8a9f0bc609bac1467c1c5b9e
Merge: 1ba54c1 660ebe7
Author: Misha Zatsman <misha-arvados at zatsman.com>
Date:   Thu Apr 24 20:12:53 2014 +0000

    Merge branch 'master' of git.curoverse.com:arvados into 2612-workbench-displays-user-storage


commit 1ba54c139354125459f3a25ad7a2894a02c7d1f4
Author: Misha Zatsman <misha-arvados at zatsman.com>
Date:   Thu Apr 24 20:11:49 2014 +0000

    Added link to storage page, replaced tabs with spaces.

diff --git a/apps/workbench/app/views/users/_show_activity.html.erb b/apps/workbench/app/views/users/_show_activity.html.erb
index ea53307..9f714be 100644
--- a/apps/workbench/app/views/users/_show_activity.html.erb
+++ b/apps/workbench/app/views/users/_show_activity.html.erb
@@ -1,4 +1,4 @@
 <p>
-  As an admin user, you can <%= link_to "view recent user activity", activity_users_url %>.
+  As an admin user, you can <%= link_to "view recent user activity", activity_users_url %> and <%= link_to "view user storage activity", storage_users_url %>.
 </p>
 
diff --git a/apps/workbench/app/views/users/storage.html.erb b/apps/workbench/app/views/users/storage.html.erb
index e736e78..30fec4a 100644
--- a/apps/workbench/app/views/users/storage.html.erb
+++ b/apps/workbench/app/views/users/storage.html.erb
@@ -36,13 +36,13 @@ table#users-storage-table .byte-value {
   <% @users.each do |user| %>
   <tr>
     <td>
-	    <% if user.uuid %>
+      <% if user.uuid %>
       <small>
-	      <%= link_to_if_arvados_object user, friendly_name: true %>
+        <%= link_to_if_arvados_object user, friendly_name: true %>
       </small>
-	    <% else %>
-	    <b>Total</b>
-	    <% end %>
+      <% else %>
+      <b>Total</b>
+      <% end %>
     </td>
     <% [:read_collections_total_bytes, :read_collections_weighted_bytes, :persisted_collections_total_bytes, :persisted_collections_weighted_bytes].each do |key| %>
     <td class="byte-value">
@@ -61,6 +61,6 @@ table#users-storage-table .byte-value {
 <% content_for :footer_js do %>
 $('#users-storage-table td small').each(function(){
     if ($(this).html().trim() == '0')
-	$(this).css('opacity', '0.3');
+  $(this).css('opacity', '0.3');
 });
 <% end %>

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


hooks/post-receive
--