[ARVADOS] updated: 1.1.4-553-gd8df5965e

[Git user]

Summary of changes:
 apps/workbench/app/controllers/work_units_controller.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

       via  d8df5965e39d27bf8465b92c4a8bd5452e78ea28 (commit)
      from  7cebf3bba60a98897ebddf5e613db6337e5f1513 (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 d8df5965e39d27bf8465b92c4a8bd5452e78ea28
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Jul 6 15:41:46 2018 -0400

    13681: Fix workbench for workflows that don't have "hints"
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb
index a229654c3..8527b4d48 100644
--- a/apps/workbench/app/controllers/work_units_controller.rb
+++ b/apps/workbench/app/controllers/work_units_controller.rb
@@ -110,13 +110,15 @@ class WorkUnitsController < ApplicationController
             input_defaults[cwl_shortname(input[:id])] = input[:default]
           end
         end
-        main[:hints].each do |hint|
-          if hint[:class] == "http://arvados.org/cwl#WorkflowRunnerResources"
-            if hint[:coresMin]
-              runtime_constraints["vcpus"] = hint[:coresMin]
-            end
-            if hint[:ramMin]
-              runtime_constraints["ram"] = hint[:ramMin] * 1024 * 1024
+        if main[:hints]
+          main[:hints].each do |hint|
+            if hint[:class] == "http://arvados.org/cwl#WorkflowRunnerResources"
+              if hint[:coresMin]
+                runtime_constraints["vcpus"] = hint[:coresMin]
+              end
+              if hint[:ramMin]
+                runtime_constraints["ram"] = hint[:ramMin] * 1024 * 1024
+              end
             end
           end
         end

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


hooks/post-receive
--