[ARVADOS] updated: 8974e10fe2dbf643861f75cffa0fba9a6db972c8

[Git user]

Summary of changes:
 apps/workbench/app/models/proxy_work_unit.rb       | 112 ++++++++++++++++++++-
 apps/workbench/app/models/work_unit.rb             |  49 +++++++++
 .../app/views/work_unit/_component_detail.html.erb |   4 +
 .../app/views/work_unit/_progress.html.erb         |   2 +-
 .../app/views/work_unit/_show_child.html.erb       |  54 +++-------
 .../app/views/work_unit/_show_component.html.erb   |  50 ++++-----
 .../pipeline_instances_controller_test.rb          |   8 +-
 apps/workbench/test/integration/jobs_test.rb       |   2 +-
 apps/workbench/test/unit/work_unit_test.rb         |  67 +++++++++++-
 services/api/test/fixtures/pipeline_instances.yml  |   2 +
 10 files changed, 267 insertions(+), 83 deletions(-)

       via  8974e10fe2dbf643861f75cffa0fba9a6db972c8 (commit)
       via  aface0b74e6b3cfaaa8d773218a5ada423a7654b (commit)
       via  d1d4aba8c3eb7e3b605639a4b02cb9d26c033ad2 (commit)
       via  3d60a5dcfb6765b223d224dda3980226230464d0 (commit)
      from  35c9bd48e78ba49d0ecdb5ea229d1b2f75157f79 (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 8974e10fe2dbf643861f75cffa0fba9a6db972c8
Merge: 35c9bd4 aface0b
Author: radhika <radhika at curoverse.com>
Date:   Sat Jun 4 19:09:58 2016 -0400

    Merge branch '8876-work-unit' into 8650-container-work-unit
    
    Conflicts:
    	apps/workbench/test/unit/work_unit_test.rb

diff --cc apps/workbench/test/unit/work_unit_test.rb
index 6d31b74,e8af04c..f00644e
--- a/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@@ -6,11 -10,10 +10,11 @@@ class WorkUnitTest < ActiveSupport::Tes
      [PipelineInstance, 'pipeline_in_running_state', nil, 1, "Running", nil, 0.0],
      [PipelineInstance, 'has_component_with_completed_jobs', nil, 3, "Complete", true, 1.0],
      [PipelineInstance, 'pipeline_with_tagged_collection_input', "pwu", 1, "Ready", nil, 0.0],
 +    [Container, 'requester', 'cwu', 3, "Complete", true, 1.0],
-   ].each do |type, name, label, num_children, state, success, progress|
-     test "children of #{name}" do
+   ].each do |type, fixture, label, num_children, state, success, progress|
+     test "children of #{fixture}" do
 -      use_token 'active'
 +      use_token 'admin'
-       obj = find_fixture(type, name)
+       obj = find_fixture(type, fixture)
        wu = obj.work_unit(label)
  
        if label != nil

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


hooks/post-receive
--