[ARVADOS] created: 4c110b5f4e8e92d613f70427f27bdfae2ea376c7

Sat Nov 15 21:10:50 EST 2014

at  4c110b5f4e8e92d613f70427f27bdfae2ea376c7 (commit)


commit 4c110b5f4e8e92d613f70427f27bdfae2ea376c7
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Nov 15 20:55:30 2014 -0500

    4388: Fix typo

diff --git a/apps/workbench/test/functional/pipeline_instances_controller_test.rb b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
index 90bccc0..a14d419 100644
--- a/apps/workbench/test/functional/pipeline_instances_controller_test.rb
+++ b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
@@ -69,7 +69,7 @@ class PipelineInstancesControllerTest < ActionController::TestCase
       end
   end
 
-  test "component rendering copes with unexpeceted components format" do
+  test "component rendering copes with unexpected components format" do
     get(:show,
         {id: api_fixture("pipeline_instances")["components_is_jobspec"]["uuid"]},
         session_for(:active))

commit 2ac2528dc0e5b700a2640e28dc66e474db9ad329
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Nov 15 20:52:39 2014 -0500

    4388: Update bundle

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 90532ea..5ab6eac 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'rails', '~> 4.1.0'
 gem 'minitest', '>= 5.0.0'
 
-gem 'arvados', '>= 0.1.20140917180103'
+gem 'arvados', '>= 0.1.20141114230720'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 53d42cb..8b9ea94 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -39,11 +39,11 @@ GEM
     addressable (2.3.6)
     andand (1.3.3)
     arel (5.0.1.20140414130214)
-    arvados (0.1.20140917180103)
+    arvados (0.1.20141114230720)
       activesupport (>= 3.2.13)
-      andand
-      google-api-client (~> 0.6.3)
-      json (>= 1.7.7)
+      andand (~> 1.3, >= 1.3.3)
+      google-api-client (~> 0.6.3, >= 0.6.3)
+      json (~> 1.7, >= 1.7.7)
       jwt (>= 0.1.5, < 1.0.0)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
@@ -114,7 +114,7 @@ GEM
     json (1.8.1)
     jwt (0.1.13)
       multi_json (>= 1.5)
-    launchy (2.4.2)
+    launchy (2.4.3)
       addressable (~> 2.3)
     less (2.4.0)
       commonjs (~> 0.2.7)
@@ -242,7 +242,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   andand
-  arvados (>= 0.1.20140917180103)
+  arvados (>= 0.1.20141114230720)
   bootstrap-sass (~> 3.1.0)
   bootstrap-tab-history-rails
   bootstrap-x-editable-rails

commit 9cd99d3070cd69664a31f8e25fad68fe8b7c43cf
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Nov 14 19:36:31 2014 -0500

    4388: Fix javascript errors.

diff --git a/apps/workbench/app/assets/javascripts/pipeline_instances.js b/apps/workbench/app/assets/javascripts/pipeline_instances.js
index 761477e..7bb7c7f 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -1,5 +1,5 @@
 function run_pipeline_button_state() {
-    var a = $('a.editable.required.editable-empty,input.form-control.required[value=]');
+    var a = $('a.editable.required.editable-empty,input.form-control.required[value=""]');
     if (a.length > 0) {
         $(".run-pipeline-button").addClass("disabled");
     }
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 0a309db..324714e 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -41,7 +41,7 @@
     }
   </style>
   <link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet">
-<%= piwik_tracking_tag %>
+  <%= piwik_tracking_tag if (PiwikAnalytics.configuration.url != 'localhost' rescue false) %>
 </head>
 <body>
 <%= render template: 'layouts/body' %>

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


hooks/post-receive
-- 


