[ARVADOS] updated: 1c36703db22a4695f0a2aebaa3ffbd5d8d64997f

Git user git at public.curoverse.com
Fri Jun 10 10:27:48 EDT 2016


Summary of changes:
 .../app/controllers/application_controller.rb      |  18 +-
 apps/workbench/app/models/container.rb             |   4 +-
 apps/workbench/app/models/container_work_unit.rb   |  53 ++++++
 apps/workbench/app/models/job_work_unit.rb         |   6 +-
 .../app/models/pipeline_instance_work_unit.rb      |  11 ++
 apps/workbench/app/models/proxy_work_unit.rb       |  16 +-
 apps/workbench/app/models/work_unit.rb             |   8 +-
 .../views/projects/_compute_node_status.html.erb   |  47 +----
 .../views/projects/_compute_node_summary.html.erb  |   7 +-
 .../app/views/projects/_show_dashboard.html.erb    | 189 ++++++++++-----------
 .../app/views/work_unit/_component_detail.html.erb |  12 +-
 .../app/views/work_unit/_progress.html.erb         |   2 +-
 .../app/views/work_unit/_show_child.html.erb       |   9 +-
 .../app/views/work_unit/_show_component.html.erb   |   3 +-
 .../app/views/work_unit/_show_outputs.html.erb     |  12 ++
 .../test/integration/application_layout_test.rb    |  28 ++-
 apps/workbench/test/integration/logins_test.rb     |   2 +-
 .../test/integration/pipeline_templates_test.rb    |   2 +-
 .../test/integration/user_profile_test.rb          |   4 +-
 apps/workbench/test/unit/work_unit_test.rb         |   1 +
 services/api/test/fixtures/container_requests.yml  |  83 +++++++++
 services/api/test/fixtures/containers.yml          | 106 +++++++++++-
 services/api/test/fixtures/pipeline_instances.yml  |   2 +
 23 files changed, 451 insertions(+), 174 deletions(-)
 create mode 100644 apps/workbench/app/models/container_work_unit.rb
 create mode 100644 apps/workbench/app/views/work_unit/_show_outputs.html.erb

       via  1c36703db22a4695f0a2aebaa3ffbd5d8d64997f (commit)
       via  d4973e18ed92e3bcc0cb8b2020649148240ce9c0 (commit)
       via  8bfd0bd237a017b2e5c7cdcd69e677b5b111d558 (commit)
       via  e016b28393b74cd30a78ebe03eca7e37a51fefd3 (commit)
       via  c3e2a93527a137fbeb3e2bb13c5ab344a95ab47f (commit)
       via  3655323be70c758c3c47460598a9644c45a3ee08 (commit)
       via  4d95f6cc422bc4dea97da79bbfbb2e7809ee20fc (commit)
       via  2efdb0e205abe63c5ca777fc4dacca65192e5dd3 (commit)
       via  5390a3481986934e240bc4d663ab2010992950e2 (commit)
       via  d519091d2d64a859d0b786df7adadeeb1d4ae958 (commit)
       via  1650c9eec24fea204cdbf5229ed61d564b48cdb9 (commit)
       via  abf6347cc1d56bc448e993249c9d6359ba60c606 (commit)
       via  f526141fa776df068d011093ccb89f31f52e69be (commit)
       via  e02bf11203b85a6baac31584b9ba451c92be21b3 (commit)
       via  c2a1512988551e03ce4270f9e936edde37f6c1b8 (commit)
       via  c554b80187e6e076cbf147b1abb34ed9eb36ce93 (commit)
       via  10e7635b3627c7a70f9ed4bc5adee92854a3a274 (commit)
       via  8974e10fe2dbf643861f75cffa0fba9a6db972c8 (commit)
       via  f9def1f7abc8ad6720d9b88ec541b00a03ff1d0e (commit)
       via  f9ac3734498a72657adf82004d012ebfae87f5cd (commit)
       via  35c9bd48e78ba49d0ecdb5ea229d1b2f75157f79 (commit)
       via  c5a633744aa99fb7c55f96ad69fd47a1c14d171c (commit)
       via  cab53a136beb1c38d9c35a6a4b1e3d664f043e8d (commit)
       via  6805fb7e020f99402aa84db45e975b3062f28251 (commit)
      from  175c0b1f257257cdf0143d727cf928986fb25871 (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 1c36703db22a4695f0a2aebaa3ffbd5d8d64997f
Merge: 175c0b1 d4973e1
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 10 10:23:55 2016 -0400

    closes #9318, closes #8650
    Merge branch '9318-dashboard-uses-work-units'


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list