[ARVADOS] updated: 1a09083539cf6e56fe91a5b5c75c20f35319922b

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |   1 +
 apps/workbench/Gemfile.lock                        |   2 +
 .../app/assets/javascripts/application.js          |  26 +++
 .../app/controllers/application_controller.rb      |   3 +
 .../app/views/layouts/application.html.erb         | 182 +--------------------
 .../{application.html.erb => body.html.erb}        |  53 +-----
 6 files changed, 38 insertions(+), 229 deletions(-)
 copy apps/workbench/app/views/layouts/{application.html.erb => body.html.erb} (82%)

       via  1a09083539cf6e56fe91a5b5c75c20f35319922b (commit)
       via  9afac37490871ab75c9836a2125b19b574bc5acd (commit)
       via  b653d031a5dbf2a42cf81d787753e945bf3911b4 (commit)
       via  4fdfbe8fb9523451b0536042d14c2f229b75c0f3 (commit)
       via  e1526dc915e10012352fdd260f9267d10fbf3542 (commit)
       via  c3d4b399c57e711f0cd87c2178f873a688323967 (commit)
       via  8d141d95a821f785f6f0619aebd3cf4a1ccdbca3 (commit)
       via  423b74882240aa5fde5ad9bf72c6a89651794882 (commit)
       via  fad046d56740092b1483cb646d2f7c92c544c165 (commit)
       via  99d62839eec24dc65760c33f699b3cae2952f01f (commit)
       via  91a3a6759a0294c28fa55f044c2d611d01054c20 (commit)
       via  a0a03c3668a3cd5956b3bd4677a15d6c86770952 (commit)
       via  05e8f8b3b2f18bab495af9b40df54126a41d963f (commit)
       via  2369ce76e5c4d7797da2845f0574b56fc7709033 (commit)
       via  1bfa822f0bf0b6ff968e229528057da299414457 (commit)
      from  08ab73ebc61834742594b0eb12c7d3fca4660360 (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 1a09083539cf6e56fe91a5b5c75c20f35319922b
Merge: 08ab73e 9afac37
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 25 21:34:42 2014 -0400

    refs #3138
    Merge branch '3138-wiselinks'


commit 9afac37490871ab75c9836a2125b19b574bc5acd
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 25 21:33:50 2014 -0400

    3138: test passing as is

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 26426c5..f5d6e63 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -45,10 +45,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       find('.btn', text: 'Add').click
     end
 
-    click_link 'Pipeline templates'
-    wait_for_ajax
     click_link 'Jobs and pipelines'
-    wait_for_ajax
     find('tr[data-kind="arvados#pipelineInstance"]', text: 'New pipeline instance').
       find('a', text: 'Show').
       click

commit b653d031a5dbf2a42cf81d787753e945bf3911b4
Merge: 4fdfbe8 08ab73e
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 25 21:24:04 2014 -0400

    Merge branch 'master' into 3138-wiselinks
    
    Conflicts:
    	apps/workbench/app/views/layouts/application.html.erb

diff --cc apps/workbench/test/integration/pipeline_instances_test.rb
index f5d6e63,f5d6e63..26426c5
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@@ -45,7 -45,7 +45,10 @@@ class PipelineInstancesTest < ActionDis
        find('.btn', text: 'Add').click
      end
  
++    click_link 'Pipeline templates'
++    wait_for_ajax
      click_link 'Jobs and pipelines'
++    wait_for_ajax
      find('tr[data-kind="arvados#pipelineInstance"]', text: 'New pipeline instance').
        find('a', text: 'Show').
        click

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


hooks/post-receive
--