[ARVADOS] updated: 45bfc1104dd30fb97a586de5ff96d6b739f7bb2b

git at public.curoverse.com git at public.curoverse.com
Wed Nov 12 13:42:14 EST 2014


Summary of changes:
 .../app/controllers/application_controller.rb      |   1 +
 .../app/controllers/collections_controller.rb      |  39 +----
 apps/workbench/app/controllers/users_controller.rb |   6 +-
 apps/workbench/app/models/arvados_api_client.rb    |   7 +-
 apps/workbench/app/models/arvados_base.rb          |   4 +-
 apps/workbench/app/models/arvados_resource_list.rb | 163 ++++++++++++---------
 .../app/views/application/_paging.html.erb         |  22 +--
 .../app/views/collections/_choose_rows.html.erb    |  18 +--
 .../app/views/collections/_index_tbody.html.erb    |   2 +-
 .../app/views/collections/_show_recent.html.erb    |   4 +-
 .../app/views/projects/_show_sharing.html.erb      |   3 +-
 .../workbench/app/views/users/_show_admin.html.erb |   2 +-
 .../test/unit/arvados_resource_list_test.rb        |  97 ++++++++----
 services/api/lib/load_param.rb                     |   7 +-
 14 files changed, 201 insertions(+), 174 deletions(-)

       via  45bfc1104dd30fb97a586de5ff96d6b739f7bb2b (commit)
       via  6bcb827b1405ce8ca5d767108bc4356ecc2972f4 (commit)
       via  093cebc3a4baed645fd5d4a5331c2ff837de8c77 (commit)
       via  91f0b180a8474321738577a12250b5a1b8f5bcbc (commit)
       via  0f9bca457448372de1d15dcd9ed4548c324ff14f (commit)
       via  83369774c123b427f519bd2a2229415fac383a6a (commit)
       via  2361a1b4d619a0f405f98c507cff6219b237bb2e (commit)
       via  47530892a8a6b174786316c3881e22dc0864c859 (commit)
      from  53381c90fd5ef26d3a0cc08c8d35318b0b92557a (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 45bfc1104dd30fb97a586de5ff96d6b739f7bb2b
Merge: 53381c9 6bcb827
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Nov 12 13:42:13 2014 -0500

    Merge branch '3400-workbench-all-items' closes #3400


commit 6bcb827b1405ce8ca5d767108bc4356ecc2972f4
Merge: 093cebc 53381c9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Nov 12 13:14:10 2014 -0500

    Merge branch 'master' into 3400-workbench-all-items


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list