[ARVADOS] updated: 1.2.0-9-g99263be28

Git user git at public.curoverse.com
Thu Aug 16 17:41:05 EDT 2018


Summary of changes:
 apps/workbench/app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  99263be28ab2ec28db721ced52357c05d11947d7 (commit)
      from  f0d67ab6f71cef3e7ce0fa850f7309a94e21671b (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 99263be28ab2ec28db721ced52357c05d11947d7
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu Aug 16 18:40:14 2018 -0300

    13340: Enhance regex to match non quoted locators
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 9562e18a3..2b48d74b2 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -673,7 +673,7 @@ module ApplicationHelper
   end
 
   # Keep locators are expected to be of the form \"...<pdh/file_path>\"
-  JSON_KEEP_LOCATOR_REGEXP = /[\'\"][^\'\"]*?([0-9a-f]{32}\+\d+[^\'\"]*?)[\'\"]/
+  JSON_KEEP_LOCATOR_REGEXP = /([0-9a-f]{32}\+\d+[^'"]*?)(?=['"]|\z|$)/
   def keep_locator_in_json str
     # Return a list of all matches
     str.scan(JSON_KEEP_LOCATOR_REGEXP).flatten

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list