[ARVADOS] updated: c3aa32a866ac5a833675888ca8106ea4a6581bc4

[Git user]

Summary of changes:
 .../views/work_units/_component_detail.html.erb    |  6 ++--
 ...inputs.html.erb => _show_mount_inputs.html.erb} |  0
 sdk/cwl/arvados_cwl/arvcontainer.py                | 26 ++++++++++++-----
 sdk/cwl/tests/test_container.py                    | 34 +++++++++++++++-------
 sdk/go/arvados/container.go                        |  1 +
 services/api/config/application.rb                 |  2 ++
 .../api/config/initializers/noop_deep_munge.rb     | 10 -------
 services/api/test/fixtures/containers.yml          |  7 +++++
 ...{noop_deep_munge.rb => noop_deep_munge_test.rb} | 29 ++++++++++--------
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 14 +++++++--
 .../crunch-dispatch-slurm_test.go                  | 15 +++++-----
 services/crunch-run/crunchrun.go                   | 19 ++++++------
 services/crunch-run/crunchrun_test.go              | 16 ++++++++++
 13 files changed, 117 insertions(+), 62 deletions(-)
 rename apps/workbench/app/views/work_units/{_show_inputs.html.erb => _show_mount_inputs.html.erb} (100%)
 delete mode 100644 services/api/config/initializers/noop_deep_munge.rb
 rename services/api/test/integration/{noop_deep_munge.rb => noop_deep_munge_test.rb} (63%)

       via  c3aa32a866ac5a833675888ca8106ea4a6581bc4 (commit)
       via  8de338d1178abb71addc344382657d3826d7f0bb (commit)
       via  c64d7e1d5d1879187e1c4002445fab1d3c7951a0 (commit)
       via  1885991dd79a75034f7650cccef16ebe3fd71959 (commit)
       via  001757381fd370a563599ca70ca9b451a71e9726 (commit)
       via  65616466b97a92e382f8e432b14ffc3711b95491 (commit)
       via  e24a892b920fd8cddf091a3c15acba1ab27f510d (commit)
       via  35dde4022e317536642646366ff01578bf904fb6 (commit)
       via  3f8f2a9b9d1ccb1e4e696607ef015de0524da519 (commit)
       via  7f9839be2facf7e5bf3106dab0859da5d971f31e (commit)
       via  9350a0562776be66a099dce1c3e825b32f5a8907 (commit)
       via  974799e09498bc5fa27ba2e269a72f8ae5173793 (commit)
      from  43a6204d0292fc4a41c370a2b77a84bc778fbdae (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 c3aa32a866ac5a833675888ca8106ea4a6581bc4
Author: radhika <radhika at curoverse.com>
Date:   Wed May 3 14:37:38 2017 -0400

    10645: rename file

diff --git a/apps/workbench/app/views/work_units/_component_detail.html.erb b/apps/workbench/app/views/work_units/_component_detail.html.erb
index f1baf7b..189c162 100644
--- a/apps/workbench/app/views/work_units/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -95,13 +95,13 @@
               <%
                 mounts = current_obj.send(:mounts) if current_obj.respond_to?(:mounts)
                 mount_wf = mounts.andand[:"/var/lib/cwl/workflow.json"]
-                mount_wf = mount_wf[5..-1] if mount_wf.andand.start_with?('keep:')
+                mount_wf = mount_wf[5..-1] if mount_wf.andand.is_a?(String) and mount_wf.start_with?('keep:')
                 mount_wf_cls = resource_class_for_uuid(mount_wf) if mount_wf
               %>
               <tr>
                 <% if mount_wf_cls == Collection %>
                   <td style="padding-right: 1em">
-                    mount workflow:
+                    mount_workflow:
                   </td>
                   <td>
                     <%= link_to_if_arvados_object mount_wf, friendly_name: true %>
@@ -178,7 +178,7 @@
                     input_mounts:
                   </td>
                   <td>
-                    <%= render partial: 'work_units/show_inputs',
+                    <%= render partial: 'work_units/show_mount_inputs',
                                         locals: {id: current_obj.uuid, name: 'mount-inputs', inputs: mnt_inputs} %>
                   </td>
                 <% end %>
diff --git a/apps/workbench/app/views/work_units/_show_inputs.html.erb b/apps/workbench/app/views/work_units/_show_mount_inputs.html.erb
similarity index 100%
rename from apps/workbench/app/views/work_units/_show_inputs.html.erb
rename to apps/workbench/app/views/work_units/_show_mount_inputs.html.erb

commit 8de338d1178abb71addc344382657d3826d7f0bb
Merge: 43a6204 c64d7e1
Author: radhika <radhika at curoverse.com>
Date:   Wed May 3 14:24:28 2017 -0400

    Merge branch 'master' into 10645-cr-mounts-display


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


hooks/post-receive
--