[ARVADOS] updated: 0149f366be76a6160408c94029f0fa2eae5b62d2

git at public.curoverse.com git at public.curoverse.com
Mon Aug 25 14:43:59 EDT 2014


Summary of changes:
 .../app/controllers/application_controller.rb      |   2 +-
 services/api/Gemfile                               |   1 +
 services/api/Gemfile.lock                          |   6 +
 .../api/app/controllers/application_controller.rb  |  37 +++---
 .../arvados/v1/collections_controller.rb           |  10 +-
 .../app/controllers/arvados/v1/users_controller.rb |  19 +--
 services/api/app/models/arvados_model.rb           | 108 ++++++++--------
 services/api/app/models/link.rb                    |  15 +--
 services/api/app/models/user.rb                    |   9 +-
 services/api/lib/current_api_client.rb             |  16 ++-
 services/api/test/factories/api_client.rb          |  10 ++
 .../api/test/factories/api_client_authorization.rb |  19 +++
 services/api/test/factories/group.rb               |   4 +
 services/api/test/factories/link.rb                |   7 ++
 services/api/test/factories/user.rb                |  44 +++++++
 services/api/test/fixtures/groups.yml              |  12 ++
 services/api/test/fixtures/links.yml               |  56 +++++++++
 .../functional/arvados/v1/links_controller_test.rb |  20 +--
 .../functional/arvados/v1/users_controller_test.rb |  85 +++++++------
 services/api/test/integration/select_test.rb       |   3 +-
 services/api/test/test_helper.rb                   |  12 +-
 services/api/test/unit/link_test.rb                |   4 +-
 services/api/test/unit/permission_test.rb          | 138 +++++++++++++++++++++
 23 files changed, 479 insertions(+), 158 deletions(-)
 create mode 100644 services/api/test/factories/api_client.rb
 create mode 100644 services/api/test/factories/api_client_authorization.rb
 create mode 100644 services/api/test/factories/group.rb
 create mode 100644 services/api/test/factories/link.rb
 create mode 100644 services/api/test/factories/user.rb

       via  0149f366be76a6160408c94029f0fa2eae5b62d2 (commit)
       via  c6378b0e7da030652334366c8459ff3853811529 (commit)
       via  da34478ce3e42df6d138c6e6e1db7c49d9d5902c (commit)
       via  7c2d7b25747a06919e8ec64f0b4391c33092d965 (commit)
       via  5674ba0e4490b53a0088cfd1181c6e1783124217 (commit)
       via  a3b9c1877a13f4c665020336584acafe43478650 (commit)
       via  62d9e76aab5c3e6c8863b1e1f42cf6d2153cdb93 (commit)
       via  3ef0016f85290758f286b6026fbd1a2d0c11ad4e (commit)
       via  42a27c7cabdacb00bd5a9ba06443c8a72322738b (commit)
       via  779547997857b04c27e5df52f70d527fcaa7a551 (commit)
       via  754d85439d5e9a835562689dee597b782932914f (commit)
      from  f792be9bcab60e7cc917d9461d46317d7d210ed6 (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 0149f366be76a6160408c94029f0fa2eae5b62d2
Merge: f792be9 c6378b0
Author: radhika <radhika at curoverse.com>
Date:   Mon Aug 25 14:37:07 2014 -0400

    Merge branch '3112-report-bug' into 3642-search-for-active-only


commit c6378b0e7da030652334366c8459ff3853811529
Merge: 32e4350 da34478
Author: radhika <radhika at curoverse.com>
Date:   Mon Aug 25 14:36:55 2014 -0400

    Merge branch 'master' into 3112-report-bug


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list