[ARVADOS] updated: c3d4b399c57e711f0cd87c2178f873a688323967

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/models/arvados_resource_list.rb | 13 +++++++---
 apps/workbench/app/models/collection.rb            |  8 ++++++
 .../views/pipeline_instances/_show_recent.html.erb |  2 +-
 .../workbench/test/integration/collections_test.rb |  6 +++++
 apps/workbench/test/integration/projects_test.rb   | 30 ++++++++++++----------
 services/api/app/models/user.rb                    | 10 +++++---
 .../db/migrate/20140714184006_empty_collection.rb  | 14 ++++++++++
 services/api/db/seeds.rb                           |  1 +
 services/api/db/structure.sql                      |  4 ++-
 services/api/lib/current_api_client.rb             | 20 +++++++++++++++
 services/api/test/fixtures/collections.yml         | 11 ++++++++
 services/api/test/fixtures/links.yml               | 16 ++++++++++++
 services/api/test/integration/permissions_test.rb  | 11 ++++++++
 13 files changed, 124 insertions(+), 22 deletions(-)
 create mode 100644 services/api/db/migrate/20140714184006_empty_collection.rb

       via  c3d4b399c57e711f0cd87c2178f873a688323967 (commit)
       via  f0abaec0c637772b781993a63b98aab85072eb97 (commit)
       via  4d0866e5d005b1c1631c80809a4757037b6dac1b (commit)
       via  eea48f38868d0663e7c8d690247b84e340109dc4 (commit)
       via  e74ede4659428af77c50057d69a0d08e4e74a6ef (commit)
       via  1be91cdf5926f71acba0f7360ab7efbe879f375b (commit)
       via  2e66bcd03991218292328f09c5520876862eb5e1 (commit)
       via  a96adab2a4758c7a969156621c0ed4fe710b98c2 (commit)
      from  8d141d95a821f785f6f0619aebd3cf4a1ccdbca3 (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 c3d4b399c57e711f0cd87c2178f873a688323967
Merge: 8d141d9 f0abaec
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 22 12:00:26 2014 -0400

    Merge branch 'master' into 3138-wiselinks


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


hooks/post-receive
--