[ARVADOS] updated: b17ed3b444abb6c326e69de5ff6a9f8bf019530e

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/models/collection.rb          |  2 --
 apps/workbench/test/integration/projects_test.rb | 10 ----------
 services/api/test/fixtures/collections.yml       |  1 -
 3 files changed, 13 deletions(-)

       via  b17ed3b444abb6c326e69de5ff6a9f8bf019530e (commit)
       via  e759c71ef7ecbfca3075db4ae94fc7bd0464656e (commit)
      from  cd00c7d65d724ea78fe6e59dda333241a7c0775a (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 b17ed3b444abb6c326e69de5ff6a9f8bf019530e
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Feb 11 18:46:07 2015 -0500

    5185: remove the unnecessary test because another test is covering the description column check already.

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index c56e613..88972e5 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -714,10 +714,4 @@ class ProjectsTest < ActionDispatch::IntegrationTest
     find("#page-wrapper .nav-tabs :first-child a").click
     assert_text("Collection modified at")
   end
-
-  test "verify description column in data collections tab" do
-    project = api_fixture('groups')['aproject']
-    visit(page_with_token('active_trustedclient', "/projects/#{project['uuid']}"))
-    assert_text 'Collection modified at' # there are collections with no descriptions
-  end
 end

commit e759c71ef7ecbfca3075db4ae94fc7bd0464656e
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Feb 11 18:44:25 2015 -0500

    5185: do not display description at all in Project -> Data collections tab because of concerns such as the description may be too big or has textile etc.

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index a8eebf3..13f5357 100644
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -37,8 +37,6 @@ class Collection < ArvadosBase
   def content_summary
     if total_bytes > 0
       ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
-    elsif description
-      description
     else
       super + " modified at " + modified_at.to_s
     end
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 1a8fa6e..c56e613 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -718,10 +718,6 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   test "verify description column in data collections tab" do
     project = api_fixture('groups')['aproject']
     visit(page_with_token('active_trustedclient', "/projects/#{project['uuid']}"))
-
-    collection = api_fixture('collections')['collection_to_move_around_in_aproject']
-    assert_text collection['name']
-    assert_text collection['description']
     assert_text 'Collection modified at' # there are collections with no descriptions
   end
 end
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index d439137..9ddc452 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -197,7 +197,6 @@ collection_to_move_around_in_aproject:
   updated_at: 2014-02-03T17:22:54Z
   manifest_text: ". 73feffa4b7f6bb68e44cf984c85f6e88+3 0:3:baz\n"
   name: collection_to_move_around
-  description: description for the collection to move around
 
 expired_collection:
   uuid: zzzzz-4zz18-mto52zx1s7sn3ih

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


hooks/post-receive
--