[ARVADOS] updated: ac958c1559429a7d8d9f7bd44422ebdc96c5be6d

[Git user]

Summary of changes:
 .../workbench/app/views/container_requests/_show_recent_rows.html.erb | 2 +-
 apps/workbench/test/integration/container_requests_test.rb            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  ac958c1559429a7d8d9f7bd44422ebdc96c5be6d (commit)
      from  06f2f3f3143f2ba4f1bf946373e8bd273d96e82b (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 ac958c1559429a7d8d9f7bd44422ebdc96c5be6d
Author: radhika <radhika at curoverse.com>
Date:   Tue May 16 12:36:30 2017 -0400

    11580: status label display

diff --git a/apps/workbench/app/views/container_requests/_show_recent_rows.html.erb b/apps/workbench/app/views/container_requests/_show_recent_rows.html.erb
index 25a6933..d11bf35 100644
--- a/apps/workbench/app/views/container_requests/_show_recent_rows.html.erb
+++ b/apps/workbench/app/views/container_requests/_show_recent_rows.html.erb
@@ -18,7 +18,7 @@
 
   <tr data-object-uuid="<%= wu.uuid %>" class="cr-<%= wu.uuid %>">
     <td>
-      <%= render partial: 'work_units/progress', locals: {wu: wu} %>
+      <span class="label label-<%= wu.state_bootstrap_class %>"><%= wu.state_label %></span>
     </td><td>
       <%= link_to_if_arvados_object obj, friendly_name: true %>
     </td><td>
diff --git a/apps/workbench/test/integration/container_requests_test.rb b/apps/workbench/test/integration/container_requests_test.rb
index a053f07..51b6b24 100644
--- a/apps/workbench/test/integration/container_requests_test.rb
+++ b/apps/workbench/test/integration/container_requests_test.rb
@@ -136,12 +136,12 @@ class ContainerRequestsTest < ActionDispatch::IntegrationTest
       assert_selector "a[href=\"/container_requests/#{running_owner_active['uuid']}\"]", text: running_owner_active[:name]
       assert_selector "a[href=\"/container_requests/#{anon_accessible_cr['uuid']}\"]", text: anon_accessible_cr[:name]
 
-      # both the active user (owner) and admin can delete the "running" CR
+      # both the active user (owner) and admin can delete the "running" container_request
       within(".cr-#{running_owner_active['uuid']}") do
         assert_not_nil first('.glyphicon-trash')
       end
 
-      # only admin user can delete the anonymously accessible CR
+      # only admin user can delete the anonymously accessible container_request
       within(".cr-#{anon_accessible_cr['uuid']}") do
         if token == 'admin'
           assert_not_nil first('.glyphicon-trash')

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


hooks/post-receive
--