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

update js_regex 2.2.1 -> 3.1

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

2 files changed, 1 insertions, 3 deletions

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