[ARVADOS] updated: f6634dddac1489a463a5eba713a0908a9c72e212

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/stylesheets/application.css.scss    |  4 ----
 apps/workbench/config/application.default.yml      |  4 ++--
 .../test/integration/application_layout_test.rb    |  2 +-
 .../workbench/test/integration/collections_test.rb | 24 ++++++++++------------
 4 files changed, 14 insertions(+), 20 deletions(-)

       via  f6634dddac1489a463a5eba713a0908a9c72e212 (commit)
       via  5b43256cd7462b92ed91bceaa1c864c1db2d400a (commit)
       via  1cf34cb15ce0d6885af6132196b43602c7d741d1 (commit)
       via  e14050324bb2bf7a10be5f23554036d191352a09 (commit)
      from  c4c188cdbe17d2fdfd6f14c0181876a78a2d4b2e (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 f6634dddac1489a463a5eba713a0908a9c72e212
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 18 13:37:21 2014 -0400

    3604: Remove useless slice.

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index bb1f7e3..78842a4 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -190,7 +190,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       end
     end
 
-    assert page.has_text? profile_message.gsub(/<.*?>/,'')[0,25]
+    assert page.has_text? profile_message.gsub(/<.*?>/,'')
     assert page.has_text? required_field_title
     page.find_field('user[prefs][:profile][:'+required_field_key+']').set 'value to fill required field'
 

commit 5b43256cd7462b92ed91bceaa1c864c1db2d400a
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 18 13:35:59 2014 -0400

    3604: Remove useless loop.

diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 5606fc4..19720cb 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -13,19 +13,17 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     page.assert_no_selector "div[data-persistent-state='#{oldstate}']"
   end
 
-  ['/collections'].each do |path|
-    test "Flip persistent switch at #{path}" do
-      Capybara.current_driver = Capybara.javascript_driver
-      uuid = api_fixture('collections')['foo_file']['uuid']
-      visit page_with_token('active', path)
-      within "tr[data-object-uuid='#{uuid}']" do
-        change_persist 'cache', 'persistent'
-      end
-      # Refresh page and make sure the change was committed.
-      visit current_path
-      within "tr[data-object-uuid='#{uuid}']" do
-        change_persist 'persistent', 'cache'
-      end
+  test "Flip persistent switch at /collections" do
+    Capybara.current_driver = Capybara.javascript_driver
+    uuid = api_fixture('collections')['foo_file']['uuid']
+    visit page_with_token('active', '/collections')
+    within "tr[data-object-uuid='#{uuid}']" do
+      change_persist 'cache', 'persistent'
+    end
+    # Refresh page and make sure the change was committed.
+    visit current_path
+    within "tr[data-object-uuid='#{uuid}']" do
+      change_persist 'persistent', 'cache'
     end
   end
 

commit 1cf34cb15ce0d6885af6132196b43602c7d741d1
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 18 12:52:53 2014 -0400

    3604: Update comment to reflect lack of built-in default.

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 45337e8..9443520 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -128,6 +128,6 @@ common:
   #      - IT
   #      - Other
 
-  # Use "user_profile_form_message" to configure the message you want to display in
-  # the profile page. If this is not provided, a default message will be displayed.
+  # Use "user_profile_form_message" to configure the message you want to display on
+  # the profile page.
   user_profile_form_message: Welcome to Arvados. All <span style="color:red">required fields</span> must be completed before you can proceed.

commit e14050324bb2bf7a10be5f23554036d191352a09
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 18 12:51:27 2014 -0400

    3604: Remove unused style.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 6b91783..c986f03 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -244,7 +244,3 @@ div.pane-content iframe {
   width: 100%;
   border: none;
 }
-
-div.rounded {
-  border-radius: 3px;
-}

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


hooks/post-receive
--