[ARVADOS] updated: e02bf11203b85a6baac31584b9ba451c92be21b3

[Git user]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb   |   4 +
 apps/workbench/app/models/container_work_unit.rb   |  16 +++
 apps/workbench/app/models/job_work_unit.rb         |  50 ++++++-
 .../app/models/pipeline_instance_work_unit.rb      |  10 +-
 apps/workbench/app/models/proxy_work_unit.rb       | 156 +++++++++++++--------
 apps/workbench/app/models/work_unit.rb             |   4 -
 .../app/views/work_unit/_show_child.html.erb       |  22 +--
 .../app/views/work_unit/_show_component.html.erb   |  59 +-------
 8 files changed, 182 insertions(+), 139 deletions(-)

       via  e02bf11203b85a6baac31584b9ba451c92be21b3 (commit)
       via  c2a1512988551e03ce4270f9e936edde37f6c1b8 (commit)
       via  c554b80187e6e076cbf147b1abb34ed9eb36ce93 (commit)
       via  c400bf1e7a52d5557c2031bdf2c8de9957425577 (commit)
      from  10e7635b3627c7a70f9ed4bc5adee92854a3a274 (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 e02bf11203b85a6baac31584b9ba451c92be21b3
Merge: 10e7635 c2a1512
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 6 20:49:46 2016 -0400

    Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units
    
    Conflicts:
    	apps/workbench/app/models/proxy_work_unit.rb

diff --cc apps/workbench/app/models/proxy_work_unit.rb
index 3f803b3,0342a40..d817bba
--- a/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@@ -145,65 -145,10 +145,21 @@@ class ProxyWorkUnit < WorkUni
      end
    end
  
-   def parameters
-     get(:script_parameters)
-   end
- 
-   def repository
-     get(:repository)
-   end
- 
-   def script
-     get(:script)
-   end
- 
-   def script_version
-     get(:script_version)
-   end
- 
-   def supplied_script_version
-     get(:supplied_script_version)
-   end
- 
-   def docker_image
-     get(:docker_image_locator)
-   end
- 
-   def nondeterministic
-     get(:nondeterministic)
-   end
- 
-   def runtime_constraints
-     get(:runtime_constraints)
-   end
- 
-   def priority
-     get(:priority)
-   end
- 
-   def log_collection
-     get(:log)
-   end
- 
-   def output
-     get(:output)
+   def children
+     []
    end
  
 +  def outputs
 +    items = []
 +    children.each do |c|
 +      items << c.output if c.output
 +    end
 +    if !items.any?
 +      items << get(:output) if get(:output)
 +    end
 +    items
 +  end
 +
-   def children
-     []
-   end
- 
    def title
      "process"
    end

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


hooks/post-receive
--