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

update js_regex 2.2.1 -> 3.1

See merge request gitlab-org/gitlab-ce!24433

5 files changed, 15 insertions, 8 deletions

diff --git a/Gemfile b/Gemfile
index 322b5951973..a2527b17b70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -187,7 +187,7 @@ gem 're2', '~> 1.1.1'
 gem 'version_sorter', '~> 2.1.0'
 
 # Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2.1'
+gem 'js_regex', '~> 3.1'
 
 # User agent parsing
 gem 'device_detector'
diff --git a/Gemfile.lock b/Gemfile.lock
index a9244fd853c..f661da41507 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,6 +113,7 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     cause (0.1)
+    character_set (1.1.2)
     charlock_holmes (0.7.6)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
@@ -400,8 +401,10 @@ GEM
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jquery-atwho-rails (1.3.2)
-    js_regex (2.2.1)
-      regexp_parser (>= 0.4.11, <= 0.5.0)
+    js_regex (3.1.1)
+      character_set (~> 1.1)
+      regexp_parser (~> 1.1)
+      regexp_property_values (~> 0.3)
     json (1.8.6)
     json-jwt (1.9.4)
       activesupport
@@ -701,7 +704,8 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.6.0)
       redis (>= 2.2, < 5)
-    regexp_parser (0.5.0)
+    regexp_parser (1.3.0)
+    regexp_property_values (0.3.4)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -1048,7 +1052,7 @@ DEPENDENCIES
   jaeger-client (~> 0.10.0)
   jira-ruby (~> 1.4)
   jquery-atwho-rails (~> 1.3.2)
-  js_regex (~> 2.2.1)
+  js_regex (~> 3.1)
   json-schema (~> 2.8.0)
   jwt (~> 2.1.0)
   kaminari (~> 1.0)
diff --git a/changelogs/unreleased/chore-update-js-regex.yml b/changelogs/unreleased/chore-update-js-regex.yml
new file mode 100644
index 00000000000..d45d0b47457
--- /dev/null
+++ b/changelogs/unreleased/chore-update-js-regex.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade js-regex gem to version 3.1
+merge_request: 24433
+author: rroger
+type: changed
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
index 34d9115a1f6..ab67a5ab847 100644
--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -51,7 +51,7 @@ describe UsersHelper do
       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  | ''                 | { 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
 
     with_them do
diff --git a/spec/validators/js_regex_validator_spec.rb b/spec/validators/js_regex_validator_spec.rb
index aeb55cdc0e5..4d3bafaf267 100644
--- a/spec/validators/js_regex_validator_spec.rb
+++ b/spec/validators/js_regex_validator_spec.rb
@@ -12,8 +12,6 @@ describe JsRegexValidator do
       ''             | []
       '(?#comment)'  | ['Regex Pattern (?#comment) can not be expressed in Javascript']
       '(?(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
 
     with_them do