[ARVADOS] updated: 5845d196105cc4676847695833b7ef3658c8a180

[git at public.curoverse.com]

Summary of changes:
 .../api_client_authorizations_controller.rb        |    2 +-
 apps/workbench/app/models/arvados_api_client.rb    |   12 ++-
 apps/workbench/app/models/arvados_resource_list.rb |   36 +++++++-
 apps/workbench/app/models/group.rb                 |   10 ++-
 apps/workbench/app/models/user.rb                  |    5 -
 .../test/unit/arvados_resource_list_test.rb        |   54 ++++++++++
 apps/workbench/test/unit/group_test.rb             |   29 +++++-
 apps/workbench/test/unit/user_test.rb              |   12 ---
 doc/api/methods/groups.html.textile.liquid         |   26 +++---
 doc/api/methods/users.html.textile.liquid          |   12 ---
 services/api/Gemfile                               |    3 +
 services/api/Gemfile.lock                          |    4 +
 .../api/app/controllers/application_controller.rb  |   32 +++---
 services/api/app/models/arvados_model.rb           |  104 +++++++++++++------
 services/api/app/models/link.rb                    |   11 ++
 services/api/app/models/node.rb                    |    2 +-
 services/api/config/routes.rb                      |    3 +-
 ...0140501165548_add_unique_name_index_to_links.rb |   13 +++
 services/api/db/schema.rb                          |    6 +-
 services/api/lib/current_api_client.rb             |    4 +-
 services/api/test/fixtures/api_clients.yml         |    2 +
 services/api/test/fixtures/groups.yml              |   22 ++++-
 services/api/test/fixtures/links.yml               |   52 +++++++++-
 services/api/test/fixtures/repositories.yml        |    4 +-
 services/api/test/fixtures/specimens.yml           |   12 +-
 .../arvados/v1/groups_controller_test.rb           |   92 ++++++++++++++++-
 .../functional/arvados/v1/links_controller_test.rb |   13 +++
 .../functional/arvados/v1/users_controller_test.rb |   76 --------------
 services/api/test/unit/group_test.rb               |   61 +++++++++++-
 services/api/test/unit/link_test.rb                |   47 ++++++++-
 30 files changed, 552 insertions(+), 209 deletions(-)
 create mode 100644 apps/workbench/test/unit/arvados_resource_list_test.rb
 create mode 100644 services/api/db/migrate/20140501165548_add_unique_name_index_to_links.rb

       via  5845d196105cc4676847695833b7ef3658c8a180 (commit)
       via  d8de76141cbe9a9af10dfc408b6d656cc727bbe5 (commit)
       via  6b21bd450e8b8ed968a965290e641a75660cd695 (commit)
       via  8370640cef5110b65ba6c3a2bf9d7f56541b4c7f (commit)
       via  e76d4b556f07bbeab0998ca0332dad187bb119ee (commit)
       via  5af51b564ca9d805f8e61b4bb3c37ed813b3bd16 (commit)
       via  546687a7c95109a57efdf7cecbc3f795bc3e72f1 (commit)
       via  76e20e694fbe708e17e57a2e0b1c36aca6e8d7d0 (commit)
       via  4e05647f7a5b3971771c5a928634c6b2a41aa591 (commit)
       via  10d03fd3b09ec9f2eaea62cc665a1022f3744b89 (commit)
       via  3ea6744bcf9cc4812ab24913286c3bc8e123b76a (commit)
       via  af3a38d81374f70d15134813563b7371e8e4127c (commit)
       via  bcc477ed88c04b3200a70d16f1fc99da11c670f8 (commit)
       via  2bb2789ff129b4112d81ba343fadfb7ad362ecd1 (commit)
       via  1c9ae7e8c8d7920602250958333751b769fb3a72 (commit)
       via  b93c1cd880d8367d11bd3fd7574e55f4545a34c5 (commit)
       via  ccce5e8ad71ed2e50ecd57c0f73f1aaafc468539 (commit)
       via  70fddd1f7cacaa0db92b3b76a0baeeddf6f0d9b6 (commit)
       via  83dcc2c95eeb38c6b0f6f7509338aa729f14d762 (commit)
       via  3bd5f6c3f353059c15eeea51b16b2fdee694d504 (commit)
       via  6a53a3c5d97d33586567f8df082a725f7d229327 (commit)
       via  da67c81ff6cc5fd540c0725de1c8208c2d8933be (commit)
       via  9cfbcdf804974812b1a4ec514f5dc7902fce6137 (commit)
       via  34350a8b802a8c48b534673a712614d36a5b97ac (commit)
       via  d649a716392760cd394e18a628dc23aaec5fa3b3 (commit)
       via  50b746d9246c19c1ad2cf506bb18a0eb8ddd0755 (commit)
       via  520d80f58ab4358dfce0233fe6880794c819760c (commit)
       via  f8cc86219281026b2867c543524f8e7fa23da291 (commit)
      from  8dbf8bd4d53c200ca81494556326c03abae74581 (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 5845d196105cc4676847695833b7ef3658c8a180
Merge: 8dbf8bd d8de761
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon May 5 17:02:37 2014 -0400

    Merge branch '2640-folder-api'


commit d8de76141cbe9a9af10dfc408b6d656cc727bbe5
Merge: 6b21bd4 8dbf8bd
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon May 5 17:01:50 2014 -0400

    Merge branch 'master' into 2640-folder-api
    
    Conflicts:
    	apps/workbench/app/models/arvados_api_client.rb


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


hooks/post-receive
--