[ARVADOS] updated: 1.1.0-67-g97ea117

[Git user]

Summary of changes:
 .../app/views/trash_items/_show_trashed_collections.html.erb          | 4 ++++
 apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb  | 4 ++++
 2 files changed, 8 insertions(+)

       via  97ea117aeff5bda8b994825a2ddeabf8196053a6 (commit)
      from  e02c4e1b1ed61d57d86f98b9372813d913d5b375 (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 97ea117aeff5bda8b994825a2ddeabf8196053a6
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Oct 20 10:23:08 2017 -0400

    12125: Added note about searching for collections within trash.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/views/trash_items/_show_trashed_collections.html.erb b/apps/workbench/app/views/trash_items/_show_trashed_collections.html.erb
index a2ef087..4c5fd3f 100644
--- a/apps/workbench/app/views/trash_items/_show_trashed_collections.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trashed_collections.html.erb
@@ -26,6 +26,10 @@ SPDX-License-Identifier: AGPL-3.0 %>
            value="<%= params[:search] %>" />
   </div>
 
+  <p>
+    <b>Note:</b> Collections which are located within a trashed project are only shown when searching the trash.
+  </p>
+
   <div>
     <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
       <colgroup>
diff --git a/apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb b/apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb
index ced1990..6f1e062 100644
--- a/apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb
@@ -26,6 +26,10 @@ SPDX-License-Identifier: AGPL-3.0 %>
            value="<%= params[:search] %>" />
   </div>
 
+  <p>
+    <b>Note:</b> Projects which are a subproject of a trashed project are only shown when searching the trash.
+  </p>
+
   <div>
     <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
       <colgroup>

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


hooks/post-receive
--