Merge branch '1979-workbench-ui-PA'

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 60a380d359ca33196a4b9130a7b986cf34458ac3..73668cdf6c7d6de4b427a584094bef424c261aca 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -13,7 +13,7 @@ class PipelineInstancesController < ApplicationController
       collections = []
 
       p.components.each do |k, v|
-        j = v[:job]
+        j = v[:job] || next
 
         uuid = j[:uuid].intern
         provenance[uuid] = j
@@ -31,7 +31,7 @@ class PipelineInstancesController < ApplicationController
         pips[uuid] |= n
       end
 
-      Collection.where(uuid: collections).each do |c|
+      Collection.where(uuid: collections.compact).each do |c|
         uuid = c.uuid.intern
         provenance[uuid] = c
         pips[uuid] = 0 unless pips[uuid] != nil
@@ -60,6 +60,7 @@ class PipelineInstancesController < ApplicationController
       :combine_jobs => :script_and_version,
       :script_version_nodes => true,
       :pips => pips }
+    super
   end
 
   def compare

diff --git a/sdk/cli/Gemfile.lock b/sdk/cli/Gemfile.lock
index ab2391a522413080d548453313c5df1e4cd9e7be..cc079c59b1be099c2fe6fe60f63bc5489628cba8 100644 (file)
--- a/sdk/cli/Gemfile.lock
+++ b/sdk/cli/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arvados-cli (0.1.20140130154213)
+    arvados-cli (0.1.20140205194548)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       curb (~> 0.8)

diff --git a/services/api/config/environments/test.rb.example b/services/api/config/environments/test.rb.example
index 82973ac1e0cd5a1e5ec835768db2269a91d33858..1782734f83f63d6a25575a119d0bad7142f2270e 100644 (file)
--- a/services/api/config/environments/test.rb.example
+++ b/services/api/config/environments/test.rb.example
@@ -64,7 +64,7 @@ Server::Application.configure do
   # config.compute_node_nameservers = ['1.2.3.4', '1.2.3.5']
   config.compute_node_nameservers = [ "172.16.0.23" ]
 
-  config.uuid_prefix('test@' + `hostname`.strip)
+  config.uuid_prefix = 'zzzzz'
 
   # Authentication stub: hard code pre-approved API tokens.
   # config.accept_api_token = { rand(2**256).to_s(36) => true }