[ARVADOS] updated: d23bc7c1abe6b81ae279298bf606f44c0d99f7fa

[Git user]

Summary of changes:
 apps/workbench/app/helpers/provenance_helper.rb     | 21 +++++++++------------
 apps/workbench/app/models/container_work_unit.rb    |  5 ++++-
 .../app/views/users/_show_activity.html.erb         |  2 +-
 .../app/views/work_units/_component_detail.html.erb | 16 +++++++++-------
 apps/workbench/test/unit/work_unit_test.rb          |  4 ++--
 ...install-manual-prerequisites.html.textile.liquid |  5 ++---
 services/nodemanager/arvnodeman/jobqueue.py         |  8 +++++++-
 services/nodemanager/tests/test_jobqueue.py         |  2 +-
 8 files changed, 35 insertions(+), 28 deletions(-)

       via  d23bc7c1abe6b81ae279298bf606f44c0d99f7fa (commit)
       via  1bfda34f36f2cf2064460f169f195fa5b2fe305a (commit)
       via  4218f74266f3fee7c618c887bea6a804005c89b9 (commit)
       via  6fd54bd2d821535231c6b7596146b301232e8976 (commit)
       via  e42bf96609791323ca21aff9768e31e809cc9439 (commit)
       via  a4a8d41f6ccd1a0a54f99fb80f3d725922c08ee1 (commit)
       via  11208178d6724a93663139565e9dad96ee7f10a3 (commit)
       via  dd0786de66c5decb8581cb092afb405eb390bca9 (commit)
       via  8ed7b6dd5d4df93a3f37096afe6d6f81c2a7ef6e (commit)
       via  f682de562d9c857616f81d48d5cd915748725197 (commit)
       via  787e77b30ed6f01ebf3ea74f4212888accf41ecf (commit)
       via  8dd7e323798d36e3182c12868c6f1f3dd0eabf96 (commit)
       via  3c4b14cf8bbfcea51fefa5d74a0c522547e0bcf4 (commit)
       via  fe29b56aecc9b5e277dd9a956fb05867827c91c9 (commit)
      from  2516e999249684e82e55c6519b54114764193963 (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 d23bc7c1abe6b81ae279298bf606f44c0d99f7fa
Author: radhika <radhika at curoverse.com>
Date:   Fri May 5 11:12:48 2017 -0400

    10645: small style updates

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 6aa5a9c..6eb2ae9 100644
--- a/apps/workbench/app/views/work_units/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -103,7 +103,7 @@
               <tr>
                 <% if mount_wf_cls == Collection %>
                   <td style="padding-right: 1em">
-                    mount_workflow:
+                    workflow.json:
                   </td>
                   <td>
                     <%= link_to_if_arvados_object mount_wf, friendly_name: true %>
@@ -143,8 +143,10 @@
             </table>
           </div>
 
-          <div class="col-md-11">
+          <div class="col-md-12">
             <table>
+              <col width="15%" />
+              <col width="85%" />
               <% [:command].each do |k| %>
                 <% val = current_obj.send(k) if current_obj.respond_to?(k) %>
                 <% if val %>
@@ -154,7 +156,7 @@
                   </td>
                   <td>
                     <% if k == :command %>
-                      <div style="max-height:200px; overflow-y:auto; padding-left: 2em">
+                      <div style="max-height:200px; overflow-y:auto;">
                         <%=val%>
                       </div>
                     <% else %>
@@ -173,18 +175,18 @@
               <tr>
                 <% if mnt_inputs %>
                   <td valign="top">
-                    input_mounts:
+                    cwl.input.json:
                   </td>
                   <td>
-                    <div style="max-height:200px; overflow:auto; padding-left: 1em">
+                    <div style="max-height:200px; overflow:auto;">
                       <% mnt_inputs.each_line do |l| %>
                         <% text_part = l %>
                           <% match = l.match /\"keep:.*?\"/ %>
                           <% if match %>
                             <% text_part = l[0..l.index("\"keep:")-1] %>
-                            <% location_part = match[0][6..-2] %>
+                            <% loc_part = match[0][6..-2] %>
                           <% end %>
-                          <span style="white-space: pre; margin: none;"><%= text_part %><%= if location_part then link_to_arvados_object_if_readable(location_part, location_part, friendly_name: true) end %> <% if location_part then %> <br/> <% end %></span>
+                          <span style="white-space: pre-wrap; margin: none;"><%= text_part %><%= if loc_part then link_to_arvados_object_if_readable(loc_part, loc_part, friendly_name: true) end %> <% if loc_part then %> <br/> <% end %></span>
                       <% end %>
                     </div>
                   </td>

commit 1bfda34f36f2cf2064460f169f195fa5b2fe305a
Merge: 4218f74 6fd54bd
Author: radhika <radhika at curoverse.com>
Date:   Fri May 5 09:44:53 2017 -0400

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


commit 4218f74266f3fee7c618c887bea6a804005c89b9
Merge: 2516e99 dd0786d
Author: radhika <radhika at curoverse.com>
Date:   Thu May 4 21:32:37 2017 -0400

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


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


hooks/post-receive
--