[ARVADOS] updated: 69e9a3e41a8d381adc095718a73a8a99a7943a5a

[Git user]

Summary of changes:
 apps/workbench/app/models/collection.rb            |  2 +-
 .../controllers/trash_items_controller_test.rb     | 14 +++++++++++
 .../arvados/v1/collections_controller.rb           |  8 ++++++-
 services/api/test/fixtures/collections.yml         | 27 ++++++++++++++++++++++
 .../arvados/v1/collections_controller_test.rb      | 21 +++++++++++++++++
 5 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 apps/workbench/test/controllers/trash_items_controller_test.rb

       via  69e9a3e41a8d381adc095718a73a8a99a7943a5a (commit)
       via  80f755b89c729a2772e9e5f5a6b23f20552f8211 (commit)
       via  7415bc3f7239b5c062e3876681265912d8150edd (commit)
       via  303650fa703e0661a71ae44fbbfcc1f28f423196 (commit)
      from  50dba76531ad4fdd5ab79598aa192dd3bb1be314 (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 69e9a3e41a8d381adc095718a73a8a99a7943a5a
Merge: 50dba76 80f755b
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 26 10:27:48 2017 -0400

    closes #11840
    
    Merge branch '11840-unique-constraint-untrash-coll'
    
    Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>


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


hooks/post-receive
--