[ARVADOS] updated: 72e22b49ec2721d3a1369da768d3d74fa9c079c3

Git user git at public.curoverse.com
Wed Jun 7 10:51:24 EDT 2017


Summary of changes:
 apps/workbench/app/assets/images/trash-icon.png    | Bin 0 -> 18381 bytes
 .../app/assets/javascripts/selection.js.erb        |   4 +
 .../workbench/app/controllers/search_controller.rb |   2 +
 .../app/controllers/trash_items_controller.rb      |  88 +++++++++++++++++++++
 apps/workbench/app/models/arvados_base.rb          |   8 ++
 apps/workbench/app/models/arvados_resource_list.rb |  11 +++
 apps/workbench/app/models/collection.rb            |   3 +
 .../app/views/application/_breadcrumbs.html.erb    |   7 ++
 .../trash_items/_create_new_object_button.html.erb |   1 +
 .../views/trash_items/_show_recent_trash.html.erb  |  54 +++++++++++++
 .../views/trash_items/_show_trash_rows.html.erb    |  32 ++++++++
 .../app/views/trash_items/_untrash_item.html.erb   |   7 ++
 .../workbench/app/views/trash_items/index.html.erb |   1 +
 .../untrash_items.js.erb}                          |   3 +-
 .../views/work_units/_show_all_processes.html.erb  |   2 +-
 apps/workbench/config/routes.rb                    |   5 ++
 .../test/controllers/search_controller_test.rb     |  23 ++++++
 apps/workbench/test/integration/trash_test.rb      |  87 ++++++++++++++++++++
 doc/api/methods/groups.html.textile.liquid         |   1 +
 .../arvados/v1/collections_controller.rb           |  13 ++-
 .../controllers/arvados/v1/groups_controller.rb    |  14 +++-
 services/api/app/models/user.rb                    |  37 +++------
 services/api/config/routes.rb                      |   1 +
 services/api/lib/can_be_an_owner.rb                |  33 ++++++++
 services/api/lib/create_ancestor_view.sql          |  14 ++++
 services/api/test/fixtures/collections.yml         |   2 +-
 .../arvados/v1/collections_controller_test.rb      |  18 +++++
 .../arvados/v1/groups_controller_test.rb           |  47 +++++++++++
 28 files changed, 484 insertions(+), 34 deletions(-)
 create mode 100644 apps/workbench/app/assets/images/trash-icon.png
 create mode 100644 apps/workbench/app/controllers/trash_items_controller.rb
 create mode 100644 apps/workbench/app/views/trash_items/_create_new_object_button.html.erb
 create mode 100644 apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
 create mode 100644 apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
 create mode 100644 apps/workbench/app/views/trash_items/_untrash_item.html.erb
 create mode 100644 apps/workbench/app/views/trash_items/index.html.erb
 copy apps/workbench/app/views/{projects/remove_items.js.erb => trash_items/untrash_items.js.erb} (58%)
 create mode 100644 apps/workbench/test/integration/trash_test.rb
 create mode 100644 services/api/lib/create_ancestor_view.sql

       via  72e22b49ec2721d3a1369da768d3d74fa9c079c3 (commit)
       via  f7b0474852fa8f270605c4cb5eeaf85c910c421e (commit)
       via  478d5dbf9a4ee280122db2a208b91d8ad97e3b99 (commit)
       via  f2fae587a47ae4e1344d6054960136f935b1449b (commit)
       via  b745c25cb15077f4f5cd658a6d59392c48bc8add (commit)
       via  29665e2d9a543bffb237d148c3484c03b03e30aa (commit)
       via  4daf12ad8cb2f74c3f3d72eafef7ed7a0621a4ac (commit)
       via  f1aed11fd3a5e204a2cf2e4fc5f099179e877eb6 (commit)
       via  aa552a3337c1a63d1638c39cb01ab03b0b9009cc (commit)
       via  87ea4388edb977d246b09b78d9d4bfa5c2ba5170 (commit)
       via  b42d7d9ed4640296ae5d01d26268c4fdba1ca10c (commit)
       via  f9ff1c5444f7030fa0b372446bd40d4feed203c8 (commit)
       via  cc77c62e148a632c5b690c275fd9fbf659ad2715 (commit)
       via  55315b668b8fa04572a44fd7db6598478f54130a (commit)
       via  0a6adabd77bf483186a29a7cffef38866a5ee8e0 (commit)
       via  0560a5812377315a92c8a4e9b41a68677832ea65 (commit)
       via  695a100d4bd3bf4f5534c7e489c118c2917bf35a (commit)
       via  51549f93489f5d57f71b7767528ee7dec9079fb6 (commit)
       via  5f8a7ee855778644abf70e7058317891738d2ce1 (commit)
       via  fd4bdb760eb47013b8b60b40859ba7f004ee8383 (commit)
       via  efcfd2cdc9a9ed6ab3af54e9a4e149d4bdf1f8d3 (commit)
       via  88abf688d7545fc663e0422f0c586107d4c56e5a (commit)
       via  6c40c1c5b000b2eb0967df0f7ebaf613393501bc (commit)
       via  5a625a53394fa99ef7fb44ab63104b8195d963df (commit)
       via  9ff2df8cfa1f0798c22e4b3c6ef91d4677961295 (commit)
       via  27355f62088566a9388972e128bfb8ba77790e9a (commit)
       via  65622f423c2ee35250856657b06118481d53edc8 (commit)
       via  741a9b3912c382b25507ca76fae15ddac020f302 (commit)
       via  1cdeb90e271f2a0c50d3552ff702b8e6f9489c74 (commit)
       via  fc10c21d75b15e36c4f861fdd17bf985ca83d888 (commit)
      from  9d894536b8a7044fdfa168f81a38c3408e6cd7b4 (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 72e22b49ec2721d3a1369da768d3d74fa9c079c3
Merge: 9d89453 f7b0474
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jun 7 10:51:15 2017 -0400

    11809: Merge branch 'master' into 11809-keep-web-cache


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list