[ARVADOS] updated: aabab05b34a7e0c87bc8b1e652a426dbde12d7fd

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb   | 4 ++++
 apps/workbench/test/integration/application_layout_test.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  aabab05b34a7e0c87bc8b1e652a426dbde12d7fd (commit)
      from  ee15a556d1ccc0723e56b4155ed1762fcb1cf60b (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 aabab05b34a7e0c87bc8b1e652a426dbde12d7fd
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Aug 17 12:03:16 2015 -0400

    6640: Changed assertion and fixed bug causing different amount
    of projects to show up.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index db3d430..1483187 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -744,8 +744,12 @@ class ApplicationController < ActionController::Base
 
   helper_method :all_projects
   def all_projects
+    limit = @limit
+    @limit = nil
     @all_projects ||= Group.
       filter([['group_class','=','project']]).order('name')
+    @limit = limit
+    @all_projects
   end
 
   helper_method :my_projects
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 6895a56..a1fe473 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -27,7 +27,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         assert_selector 'a', text: 'Search all projects'
         assert_no_selector 'a', text: 'Browse public projects'
         assert_selector 'a', text: 'Create a new project'
-        assert page.has_text?('My projects'), 'Not found text - My projects'
+        assert_selector 'li[class="dropdown-header"]', text: 'My projects'
       end
     elsif invited
       assert page.has_text?('Please check the box below to indicate that you have read and accepted the user agreement'), 'Not found text - Please check the box below . . .'

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


hooks/post-receive
--