[ARVADOS] updated: 1.1.0-84-gb927672

[Git user]

Summary of changes:
 .../app/assets/stylesheets/application.css.scss    |  4 +
 .../app/controllers/projects_controller.rb         | 25 +-----
 .../app/controllers/trash_items_controller.rb      | 91 +++++++++++++++++-----
 apps/workbench/app/models/group.rb                 |  4 +
 apps/workbench/app/views/application/404.html.erb  | 57 +++++++++++++-
 .../views/trash_items/_show_trash_rows.html.erb    | 55 ++++++-------
 .../_show_trashed_collection_rows.html.erb         |  1 +
 ...html.erb => _show_trashed_collections.html.erb} | 22 +++---
 .../_show_trashed_project_rows.html.erb            |  1 +
 ...sh.html.erb => _show_trashed_projects.html.erb} | 24 +++---
 .../app/views/trash_items/_untrash_item.html.erb   |  8 +-
 .../test/controllers/projects_controller_test.rb   |  1 -
 apps/workbench/test/integration/trash_test.rb      | 77 +++++++++++++++++-
 services/api/lib/trashable.rb                      |  2 +-
 services/api/test/fixtures/groups.yml              |  3 +
 15 files changed, 279 insertions(+), 96 deletions(-)
 create mode 120000 apps/workbench/app/views/trash_items/_show_trashed_collection_rows.html.erb
 copy apps/workbench/app/views/trash_items/{_show_recent_trash.html.erb => _show_trashed_collections.html.erb} (76%)
 create mode 120000 apps/workbench/app/views/trash_items/_show_trashed_project_rows.html.erb
 rename apps/workbench/app/views/trash_items/{_show_recent_trash.html.erb => _show_trashed_projects.html.erb} (75%)

       via  b9276721177e8aa6710ed7203f1142f9062af81c (commit)
       via  e76a00ca471102d1e536737073314e0f36cf086a (commit)
       via  6e68c94524cfb19fc0b51591eab7e4a55e485164 (commit)
       via  97ea117aeff5bda8b994825a2ddeabf8196053a6 (commit)
       via  e02c4e1b1ed61d57d86f98b9372813d913d5b375 (commit)
       via  6afdf38337e3278234d03480b64e50beaddcd105 (commit)
       via  656176226eeb75d24c17de792cc090e4862c46f5 (commit)
       via  98aa37e898eca8021206b838b45cbe66bfa9e4e3 (commit)
       via  d80d6de97c0e54249bdbd1f7c92014ef6855448c (commit)
       via  e951503aca74be84ea501d4316e38a662210b247 (commit)
       via  c62d9a299247f31ef1baff27b9726010c963e3f1 (commit)
       via  ae0781e5decb54f1c18f1dc12961b18d03043337 (commit)
       via  9d223ac56644eb23cdc39c5044f4fb12cf29b685 (commit)
       via  14fccf0ed91ebb0a0dbf1bff47edfb156538f42f (commit)
       via  9adcefaec1be61e847d0e463f609e035995bb51f (commit)
       via  b74478a602b3cc5fcc18c2beb2962f98d1225ac4 (commit)
       via  9a4c456560f0b78660c2bfc9a7aa4030de74c741 (commit)
      from  1b5e5a3ef2c174358693f83849f05ed8276be657 (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 b9276721177e8aa6710ed7203f1142f9062af81c
Merge: 1b5e5a3 e76a00c
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Oct 23 16:03:17 2017 -0400

    Merge branch '12125-workbench-project-trash' refs #12125
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


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


hooks/post-receive
--