[ARVADOS] updated: b6e28fbe905737bd0ea5bda5f4fd74fd259c58b1

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/infinite_scroll.js      |  3 +-
 .../app/controllers/application_controller.rb      | 30 ++++++--
 .../app/controllers/projects_controller.rb         | 82 ++++++++++++++++------
 .../app/views/application/_content.html.erb        |  3 +-
 .../app/views/application/_content_layout.html.erb | 15 ++--
 .../views/application/_tab_line_buttons.html.erb   |  0
 apps/workbench/app/views/application/show.html.erb |  1 -
 .../app/views/collections/_show_files.html.erb     |  5 --
 .../app/views/collections/_show_recent.html.erb    | 13 ----
 .../workbench/app/views/collections/index.html.erb | 14 ++++
 apps/workbench/app/views/collections/show.html.erb |  7 +-
 .../app/views/keep_disks/_content_layout.html.erb  |  4 +-
 .../views/pipeline_instances/_show_recent.html.erb |  7 --
 .../app/views/pipeline_instances/index.html.erb    |  8 +++
 .../pipeline_templates/_show_components.html.erb   | 17 -----
 .../{_show_components.html.erb => show.html.erb}   |  2 +-
 .../views/projects/_show_contents_rows.html.erb    | 11 +--
 .../views/projects/_show_data_collections.html.erb | 72 +------------------
 .../projects/_show_jobs_and_pipelines.html.erb     | 11 +--
 .../views/projects/_show_other_objects.html.erb    | 11 +--
 .../projects/_show_pipeline_templates.html.erb     | 11 +--
 .../app/views/projects/_show_sharing.html.erb      | 10 ++-
 .../app/views/projects/_show_subprojects.html.erb  | 11 +--
 .../app/views/projects/_show_tab_contents.html.erb | 10 ++-
 ...how_data_collections.html.erb => show.html.erb} |  9 +--
 .../test/functional/projects_controller_test.rb    | 72 ++++++++++++++++++-
 apps/workbench/test/integration/projects_test.rb   | 12 ++--
 apps/workbench/test/test_helper.rb                 |  3 +
 services/api/test/fixtures/jobs.yml                | 11 +++
 services/api/test/fixtures/pipeline_instances.yml  |  5 ++
 30 files changed, 254 insertions(+), 216 deletions(-)
 copy services/fuse/tests/__init__.py => apps/workbench/app/views/application/_tab_line_buttons.html.erb (100%)
 create mode 100644 apps/workbench/app/views/collections/index.html.erb
 create mode 100644 apps/workbench/app/views/pipeline_instances/index.html.erb
 copy apps/workbench/app/views/pipeline_templates/{_show_components.html.erb => show.html.erb} (93%)
 copy apps/workbench/app/views/projects/{_show_data_collections.html.erb => show.html.erb} (86%)

       via  b6e28fbe905737bd0ea5bda5f4fd74fd259c58b1 (commit)
       via  588a4505ac005d54b7aad208e038ded0a978425d (commit)
       via  9d76f0c0fc0c35b70f3988695fcb253e1739e36b (commit)
       via  41e77a9116878cd9527d042ce80a987f2c04010e (commit)
       via  3b98ce7a73f94fcf0ccc24bb4b3eac576744cebb (commit)
       via  acba0c0caa17d721724533803f797235ab572d94 (commit)
       via  c7cf7b6012ecf15264e48af9c7fa4a4e93519a40 (commit)
       via  9b5c87a043b10e1d983ec1c7e8b7784e5b79c5ae (commit)
       via  6060e478ec99b9dbc12785fadc76d388d6678fe3 (commit)
       via  fe3b22e8850d28e5d2b30f59c112087d892844dd (commit)
       via  f8df913d401e7d6015631741952429ec683671e8 (commit)
       via  c2cd31f182e588363a20fe855be3058c5505dda8 (commit)
       via  8fc5d7b3a697e08391296ac4d434f4f4a23a695a (commit)
       via  f22dc5b8e0b2d844c03656a959085006b6c56dac (commit)
       via  6f69b8a9314ca4041291411d7a3c57686399e9e5 (commit)
       via  b7744c883953c97568f851995d722a0ed044774e (commit)
       via  e5337814593c504ef71e9f517dc1d99d41e19784 (commit)
      from  6520a31f91a590fe8d559c14e75e6c99a676ba20 (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 b6e28fbe905737bd0ea5bda5f4fd74fd259c58b1
Merge: 6520a31 588a450
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Aug 12 14:19:48 2014 -0400

    Merge branch '3531-sort-jobs-with-pipelines' closes #3531


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


hooks/post-receive
--