[ARVADOS] updated: 35cd1ab03e06910a2536bb473529511b8af20b94

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/stylesheets/collections.css.scss    |  46 +++++++++
 .../app/controllers/collections_controller.rb      |  94 ++++++-----------
 apps/workbench/app/helpers/application_helper.rb   |  13 +++
 apps/workbench/app/models/collection.rb            |  21 ++++
 .../app/views/collections/_show_files.html.erb     | 111 ++++++++++-----------
 .../app/views/collections/_show_jobs.html.erb      |  64 ------------
 .../views/collections/_show_provenance.html.erb    |  84 ----------------
 .../views/collections/_show_source_data.html.erb   |  44 --------
 apps/workbench/app/views/collections/show.html.erb | 105 +++++++++++++++++++
 apps/workbench/app/views/folders/show.html.erb     |  60 ++++++-----
 .../test/functional/collections_controller_test.rb |  50 ++++++++--
 apps/workbench/test/unit/collection_test.rb        |  27 +++++
 .../test/unit/helpers/collections_helper_test.rb   |   8 ++
 services/api/app/models/arvados_model.rb           |   4 +-
 services/api/config/initializers/secret_token.rb   |   7 --
 services/api/test/fixtures/collections.yml         |  21 ++++
 services/api/test/fixtures/jobs.yml                |   2 +-
 services/api/test/fixtures/logs.yml                |   5 +
 services/keep/src/keep/keep.go                     |  30 +++++-
 19 files changed, 437 insertions(+), 359 deletions(-)
 delete mode 100644 apps/workbench/app/views/collections/_show_jobs.html.erb
 delete mode 100644 apps/workbench/app/views/collections/_show_provenance.html.erb
 delete mode 100644 apps/workbench/app/views/collections/_show_source_data.html.erb
 create mode 100644 apps/workbench/app/views/collections/show.html.erb
 delete mode 100644 services/api/config/initializers/secret_token.rb

       via  35cd1ab03e06910a2536bb473529511b8af20b94 (commit)
       via  ebf002120164e185691b6bf418a17b23124614a8 (commit)
       via  1bb9f9ca3ffe077f2d90d7de65fbee37a717ef23 (commit)
       via  e1d71c83e17ba6d06e2442ed775f7efd4ea32d84 (commit)
       via  735a268880783acc77a2b99a5ac32c819c154ad9 (commit)
       via  46e29d7fbf2628a01cb31ff7117732293129fd65 (commit)
       via  ea4b289bea3baebde1d23bbf38ded4e8da7ff298 (commit)
       via  8cc0ba260202de5627af49691d259928ad7ffcc6 (commit)
       via  43f38dbf96127a4036be5e8b01f9e82d825ad949 (commit)
       via  4b6ae0c2b418fd3192b8248b3e8a614502c47060 (commit)
       via  e5b3a58e1106fe71d781995560f8b197dbaecbca (commit)
       via  e817beda3c9aefd99b1ce9b9c77cd2f346e14a01 (commit)
       via  fc16a366bf1061bfc2dc08ab1477c7febf8c3c5a (commit)
       via  9a86712b5b6ca3490739e5b75d809be4c853e9a3 (commit)
       via  2768b056f5d99952d2d2c4ba8cd1dfbb898901e3 (commit)
       via  c965f26c02b0f358eccf6989e49703d173206486 (commit)
       via  f1a04b3e3c61cc92501d18863ccf0abb162f9855 (commit)
       via  6d1b822d5a168166deb44d4256bf0abcfd618c67 (commit)
       via  9cdf7a2f51489403a488c3d06cf252a36b8e4198 (commit)
       via  c3367d7b827035d0cfc3418bc028a67142696e13 (commit)
       via  4e9567a57ed7af343e24eeb4dc403a1eb73b1f81 (commit)
      from  49d953403625ca145081f9ccd914e70d49e51d49 (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 35cd1ab03e06910a2536bb473529511b8af20b94
Merge: 49d9534 ebf0021
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 21 14:31:03 2014 -0400

    Merge branch 'master' into 2776-keep-services-table


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


hooks/post-receive
--