[ARVADOS] updated: 2e5f6787e7b37a47247035803fba41354cbdabdd

[Git user]

Summary of changes:
 .../app/controllers/application_controller.rb      |   5 +-
 .../controllers/container_requests_controller.rb   |  12 +++
 .../app/controllers/containers_controller.rb       |   3 +
 apps/workbench/app/models/container.rb             |   4 +
 apps/workbench/app/models/container_request.rb     |  10 ++
 apps/workbench/app/models/container_work_unit.rb   | 118 +++++++++++++++++----
 apps/workbench/app/models/proxy_work_unit.rb       |  16 +--
 apps/workbench/app/models/work_unit.rb             |  24 +++++
 .../views/container_requests/_show_status.html.erb |   1 +
 .../app/views/containers/_show_status.html.erb     |  17 +++
 .../workbench/app/views/jobs/_show_status.html.erb |  13 +--
 .../app/views/projects/_show_dashboard.html.erb    |  11 +-
 .../app/views/work_unit/_component_detail.html.erb |  15 ++-
 .../app/views/work_unit/_show_status.html.erb      |   6 ++
 apps/workbench/config/routes.rb                    |   4 +-
 .../test/integration/application_layout_test.rb    |  83 +++++++++++++--
 apps/workbench/test/unit/work_unit_test.rb         |   1 +
 services/api/app/models/container_request.rb       |  10 +-
 services/api/test/fixtures/container_requests.yml  |  24 ++++-
 services/api/test/fixtures/containers.yml          |   3 +-
 services/api/test/fixtures/pipeline_instances.yml  |  10 +-
 services/api/test/unit/container_request_test.rb   |   2 +-
 22 files changed, 320 insertions(+), 72 deletions(-)
 create mode 100644 apps/workbench/app/views/container_requests/_show_status.html.erb
 create mode 100644 apps/workbench/app/views/containers/_show_status.html.erb
 create mode 100644 apps/workbench/app/views/work_unit/_show_status.html.erb

       via  2e5f6787e7b37a47247035803fba41354cbdabdd (commit)
       via  92b530ffbb5022192f00977183e591ae81240347 (commit)
       via  529dbc0b24f9dc06c3af1abaadd97374419d9507 (commit)
       via  adfc2c563d47c0eb70985245a1a7c4df004d7aa0 (commit)
       via  bfdf3d5b0ab2b2747321f3d5e2fc3e18f165fefd (commit)
       via  e7d49ab46462902a98d812b69d7257d837f85e90 (commit)
       via  cbd67fc6ba667bc27ca7e885145a6e34e5596f37 (commit)
       via  4a6b74c22201ceac36797b7722d52407eec63536 (commit)
       via  2d5ef50536851f8d190675a3bd74ee7567713ee0 (commit)
       via  e4c30dbf271df0633efce61c630a29c89bc43bff (commit)
       via  b3b64d046641ccc39e4f4d6fab85a8b831732d51 (commit)
      from  1f2bc01d1b9ad8aa742a8bec006d3f15e184dd5d (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 2e5f6787e7b37a47247035803fba41354cbdabdd
Merge: 1f2bc01 92b530f
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 17 11:13:28 2016 -0400

    closes #9372
    Merge branch '9372-container-display'


commit 92b530ffbb5022192f00977183e591ae81240347
Merge: 529dbc0 1f2bc01
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 17 11:13:12 2016 -0400

    Merge branch 'master' into 9372-container-display


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


hooks/post-receive
--