[ARVADOS] updated: 7f2449727f36a2687f22be1b3587674a2eb8c7ed

[git at public.curoverse.com]

Summary of changes:
 .../controllers/pipeline_instances_controller.rb   |    2 +-
 .../app/helpers/pipeline_instances_helper.rb       |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

       via  7f2449727f36a2687f22be1b3587674a2eb8c7ed (commit)
      from  1ad669e1a65f24363d8f6b45798d96e6592e2bb7 (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 7f2449727f36a2687f22be1b3587674a2eb8c7ed
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Feb 4 13:10:04 2014 -0800

    Fix script_parameters comparison on pipeline_instances.compare.
    
    refs #1978

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 98ae0e6..4798271 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -97,7 +97,7 @@ class PipelineInstancesController < ApplicationController
         pj.each do |k,v|
           vstr = for_comparison v
           score[k] ||= {}
-          score[k][vstr] = (score[k][vstr.to_s] || 0) + 1
+          score[k][vstr] = (score[k][vstr] || 0) + 1
           highscore[k] ||= 0
           if score[k][vstr] == highscore[k]
             # tie for first place = no "normal"
diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index fbce7f5..766c1c4 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -77,6 +77,7 @@ module PipelineInstancesHelper
       end
       pj[:job_id] = pj[:job][:uuid]
       pj[:script] = pj[:job][:script] || c[:script]
+      pj[:script_parameters] = pj[:job][:script_parameters] || c[:script_parameters]
       pj[:script_version] = pj[:job][:script_version] || c[:script_version]
       pj[:output] = pj[:job][:output]
       pj[:finished_at] = (Time.parse(pj[:job][:finished_at]) rescue nil)

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


hooks/post-receive
--