[ARVADOS] updated: 89fcf2b60968558a6994ee14c202bc2c76f1d8fe

git at public.curoverse.com git at public.curoverse.com
Wed Apr 16 14:29:26 EDT 2014


Summary of changes:
 apps/workbench/app/assets/javascripts/selection.js |   10 +++--
 .../app/controllers/collections_controller.rb      |    1 +
 apps/workbench/app/helpers/application_helper.rb   |   34 ++++++++++++++++---
 .../views/application/_selection_checkbox.html.erb |   19 +++++++++--
 .../app/views/collections/_index_tbody.html.erb    |    8 +++-
 .../app/views/collections/_show_files.html.erb     |    5 ++-
 .../app/views/layouts/application.html.erb         |    2 +-
 apps/workbench/test/integration/users_test.rb      |    2 +-
 8 files changed, 61 insertions(+), 20 deletions(-)

       via  89fcf2b60968558a6994ee14c202bc2c76f1d8fe (commit)
       via  8048da32800fab790b68f502c52dd00c89b5b690 (commit)
       via  340bd4f69f320d541b6c352953ca9ac2336da470 (commit)
       via  d66cd99b144e949dc7128e7299689ca567a761c8 (commit)
       via  2a73947440a58ce3a63adac1b903421ea911c5cf (commit)
       via  6c76e5ce6520a465ff741e4510eafc757738e9ba (commit)
      from  dc51a3a6a2915d66f1b8f82580637b5733bb49f5 (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 89fcf2b60968558a6994ee14c202bc2c76f1d8fe
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Apr 16 14:29:22 2014 -0400

    Increased wait time on capybara test to reduce chance of failure.

diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb
index 22b92c0..df7d245 100644
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -122,7 +122,7 @@ class UsersTest < ActionDispatch::IntegrationTest
       click_button "Submit"
     end
 
-    sleep(0.1)
+    sleep(1)
     assert page.has_text? 'modified_by_client_uuid'
 
     click_link 'Metadata'

commit 8048da32800fab790b68f502c52dd00c89b5b690
Merge: dc51a3a 340bd4f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Apr 16 14:11:44 2014 -0400

    Merge branch '2376-show-collection-tags-everywhere'
    
    Conflicts:
    	apps/workbench/app/controllers/actions_controller.rb


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list