[ARVADOS] updated: 8ee2f83955b1b71571aa428335340f505c3c2264

[Git user]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb   |  6 ++
 apps/workbench/app/models/container_work_unit.rb   | 13 +++-
 apps/workbench/app/models/work_unit.rb             |  4 ++
 .../application/_show_text_with_locators.html.erb  | 16 +++++
 .../views/work_units/_component_detail.html.erb    | 76 ++++++++++++++++++++--
 .../app/views/work_units/_show_table_data.html.erb | 14 ++++
 .../container_requests_controller_test.rb          | 16 +++++
 services/api/test/fixtures/container_requests.yml  | 33 ++++++++++
 8 files changed, 171 insertions(+), 7 deletions(-)
 create mode 100644 apps/workbench/app/views/application/_show_text_with_locators.html.erb
 create mode 100644 apps/workbench/app/views/work_units/_show_table_data.html.erb

       via  8ee2f83955b1b71571aa428335340f505c3c2264 (commit)
       via  537ff1dfe42c8a1c076ea31a137801cab8e95b96 (commit)
       via  4e32a5d047ab832e7399dedd7b5dd5f8fc364367 (commit)
       via  2c60e15078452202ff58eac99d44920448fb7b9a (commit)
       via  dd69c4bad124d39f876ec6fb0e733e2db289a4bd (commit)
       via  575b2f04b80a8bb2cf5ab61ce80a94d5fe017aa3 (commit)
       via  5a649613ade7f4bb9c80bbfec62604698383c1d1 (commit)
       via  e49882e535f1464673d547ba37c636ec1eb8d0ab (commit)
       via  78408743bab09078a7361620fc6a6be524fdac73 (commit)
       via  75a76c083c8f257c33ad31582aac7a86bc866bb5 (commit)
       via  aa6a63fb550222ecb8353585ab7e19a2c1d261e4 (commit)
       via  ee434dea5db0b02fe762ff80b2270cf268e84378 (commit)
       via  b58953e9b4c54757db68dd8661aeb170635643b2 (commit)
       via  d4eead3501dfe0f002e95574b91d835ed792d92e (commit)
       via  7ea93a3e137a3375daa76073ddbd582deb22141c (commit)
       via  50a1f82945a564e16b564c9cab009dac8ec78a37 (commit)
       via  d23bc7c1abe6b81ae279298bf606f44c0d99f7fa (commit)
       via  1bfda34f36f2cf2064460f169f195fa5b2fe305a (commit)
       via  4218f74266f3fee7c618c887bea6a804005c89b9 (commit)
       via  2516e999249684e82e55c6519b54114764193963 (commit)
       via  c3aa32a866ac5a833675888ca8106ea4a6581bc4 (commit)
       via  8de338d1178abb71addc344382657d3826d7f0bb (commit)
       via  43a6204d0292fc4a41c370a2b77a84bc778fbdae (commit)
       via  23825c0b5ecf436b29a36a1c27efe1120485827e (commit)
       via  6f62739bee508c9b2b8c4ce2f2593fe1714cfda6 (commit)
      from  08e9c6aff46e182b9cd14fab9d42d21b2d7c6902 (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 8ee2f83955b1b71571aa428335340f505c3c2264
Merge: 08e9c6a 537ff1d
Author: radhika <radhika at curoverse.com>
Date:   Tue May 9 10:31:06 2017 -0400

    refs #10645
    Merge branch '10645-cr-mounts-display'


commit 537ff1dfe42c8a1c076ea31a137801cab8e95b96
Author: radhika <radhika at curoverse.com>
Date:   Tue May 9 10:28:23 2017 -0400

    10645: added comment

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index db6ae38..0f60bcd 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -671,9 +671,9 @@ module ApplicationHelper
   end
 
   # Keep locators are expected to be of the form \"...<pdh/file_path>\"
-  KEEP_LOCATOR_REGEXP = /(.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*))/
+  JSON_KEEP_LOCATOR_REGEXP = /(.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*))/
   def keep_locator_in_json str
-    KEEP_LOCATOR_REGEXP.match str
+    JSON_KEEP_LOCATOR_REGEXP.match str
   end
 
 private
diff --git a/apps/workbench/app/views/application/_show_text_with_locators.html.erb b/apps/workbench/app/views/application/_show_text_with_locators.html.erb
index 9662e30..f25bd2b 100644
--- a/apps/workbench/app/views/application/_show_text_with_locators.html.erb
+++ b/apps/workbench/app/views/application/_show_text_with_locators.html.erb
@@ -1,3 +1,5 @@
+<%# The locators in the given text are expected to be of the form JSON_KEEP_LOCATOR_REGEXP %>
+
 <% data_height = data_height || 100 %>
   <div style="max-height:<%=data_height%>px; overflow:auto;">
     <% text_data.each_line do |l| %>

commit 4e32a5d047ab832e7399dedd7b5dd5f8fc364367
Merge: 2c60e15 08e9c6a
Author: radhika <radhika at curoverse.com>
Date:   Tue May 9 07:35:16 2017 -0400

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


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


hooks/post-receive
--