Commit ae55a99f authored by Stan Hu's avatar Stan Hu

Merge branch 'chore/update-js-regex' into 'master'

update js_regex 2.2.1 -> 3.1

See merge request gitlab-org/gitlab-ce!24433
parents d8e24e9d 4a001c06
...@@ -187,7 +187,7 @@ gem 're2', '~> 1.1.1' ...@@ -187,7 +187,7 @@ gem 're2', '~> 1.1.1'
gem 'version_sorter', '~> 2.1.0' gem 'version_sorter', '~> 2.1.0'
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 2.2.1' gem 'js_regex', '~> 3.1'
# User agent parsing # User agent parsing
gem 'device_detector' gem 'device_detector'
......
...@@ -113,6 +113,7 @@ GEM ...@@ -113,6 +113,7 @@ GEM
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
mime-types (>= 1.16) mime-types (>= 1.16)
cause (0.1) cause (0.1)
character_set (1.1.2)
charlock_holmes (0.7.6) charlock_holmes (0.7.6)
childprocess (0.9.0) childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
...@@ -400,8 +401,10 @@ GEM ...@@ -400,8 +401,10 @@ GEM
multipart-post multipart-post
oauth (~> 0.5, >= 0.5.0) oauth (~> 0.5, >= 0.5.0)
jquery-atwho-rails (1.3.2) jquery-atwho-rails (1.3.2)
js_regex (2.2.1) js_regex (3.1.1)
regexp_parser (>= 0.4.11, <= 0.5.0) character_set (~> 1.1)
regexp_parser (~> 1.1)
regexp_property_values (~> 0.3)
json (1.8.6) json (1.8.6)
json-jwt (1.9.4) json-jwt (1.9.4)
activesupport activesupport
...@@ -701,7 +704,8 @@ GEM ...@@ -701,7 +704,8 @@ GEM
redis-store (>= 1.2, < 2) redis-store (>= 1.2, < 2)
redis-store (1.6.0) redis-store (1.6.0)
redis (>= 2.2, < 5) redis (>= 2.2, < 5)
regexp_parser (0.5.0) regexp_parser (1.3.0)
regexp_property_values (0.3.4)
representable (3.0.4) representable (3.0.4)
declarative (< 0.1.0) declarative (< 0.1.0)
declarative-option (< 0.2.0) declarative-option (< 0.2.0)
...@@ -1048,7 +1052,7 @@ DEPENDENCIES ...@@ -1048,7 +1052,7 @@ DEPENDENCIES
jaeger-client (~> 0.10.0) jaeger-client (~> 0.10.0)
jira-ruby (~> 1.4) jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2) jquery-atwho-rails (~> 1.3.2)
js_regex (~> 2.2.1) js_regex (~> 3.1)
json-schema (~> 2.8.0) json-schema (~> 2.8.0)
jwt (~> 2.1.0) jwt (~> 2.1.0)
kaminari (~> 1.0) kaminari (~> 1.0)
......
---
title: Upgrade js-regex gem to version 3.1
merge_request: 24433
author: rroger
type: changed
...@@ -51,7 +51,7 @@ describe UsersHelper do ...@@ -51,7 +51,7 @@ describe UsersHelper do
false | 'mockRegexPattern' | { user_internal_regex_pattern: nil, user_internal_regex_options: nil } false | 'mockRegexPattern' | { user_internal_regex_pattern: nil, user_internal_regex_options: nil }
true | nil | { user_internal_regex_pattern: nil, user_internal_regex_options: nil } true | nil | { user_internal_regex_pattern: nil, user_internal_regex_options: nil }
true | '' | { user_internal_regex_pattern: nil, user_internal_regex_options: nil } true | '' | { user_internal_regex_pattern: nil, user_internal_regex_options: nil }
true | 'mockRegexPattern' | { user_internal_regex_pattern: 'mockRegexPattern', user_internal_regex_options: 'gi' } true | 'mockRegexPattern' | { user_internal_regex_pattern: 'mockRegexPattern', user_internal_regex_options: 'i' }
end end
with_them do with_them do
......
...@@ -12,8 +12,6 @@ describe JsRegexValidator do ...@@ -12,8 +12,6 @@ describe JsRegexValidator do
'' | [] '' | []
'(?#comment)' | ['Regex Pattern (?#comment) can not be expressed in Javascript'] '(?#comment)' | ['Regex Pattern (?#comment) can not be expressed in Javascript']
'(?(a)b|c)' | ['invalid conditional pattern: /(?(a)b|c)/i'] '(?(a)b|c)' | ['invalid conditional pattern: /(?(a)b|c)/i']
'[a-z&&[^uo]]' | ["Dropped unsupported set intersection '[a-z&&[^uo]]' at index 0",
"Dropped unsupported nested negative set data '[^uo]' at index 6"]
end end
with_them do with_them do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment