From d4001e155679db1282dd13ac1bb399414eb22a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Ru=CC=88ttimann?= Date: Mon, 14 Jan 2019 10:44:36 +0100 Subject: update js_regex version --- Gemfile | 2 +- Gemfile.lock | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 5972c434d7e..ea38a170f59 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 b4602dbbf36..d436dc698ce 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) @@ -394,8 +395,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 @@ -693,7 +696,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) @@ -1039,7 +1043,7 @@ DEPENDENCIES influxdb (~> 0.2) 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) -- cgit v1.2.1 From 9eb64a3455f4d3115c41bef5e5b0cdd8739bbb0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Ru=CC=88ttimann?= Date: Mon, 14 Jan 2019 12:59:08 +0100 Subject: fix initialization of JsRegex after js_regex gem update change --- app/helpers/users_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 73c1402eae5..949ca5fa5ec 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -30,7 +30,7 @@ module UsersHelper pattern, options = if settings.user_default_internal_regex_enabled? regex = settings.user_default_internal_regex_instance - JsRegex.new(regex).to_h.slice(:source, :options).values + JsRegex.new(regex, options: 'g').to_h.slice(:source, :options).values end { user_internal_regex_pattern: pattern, user_internal_regex_options: options } -- cgit v1.2.1 From 3197cd9b6cffadee9e5d633bd7d1f7673d1b9229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Ru=CC=88ttimann?= Date: Mon, 14 Jan 2019 13:42:27 +0100 Subject: remove newly supported regex feature from validation error test --- spec/validators/js_regex_validator_spec.rb | 2 -- 1 file changed, 2 deletions(-) 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 -- cgit v1.2.1 From 28afbe46062797d4301f3bcf74bd7b11017090fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Ru=CC=88ttimann?= Date: Tue, 5 Feb 2019 13:01:50 +0100 Subject: remove unnuesd global regex flag g --- app/helpers/users_helper.rb | 2 +- spec/helpers/users_helper_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 949ca5fa5ec..73c1402eae5 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -30,7 +30,7 @@ module UsersHelper pattern, options = if settings.user_default_internal_regex_enabled? regex = settings.user_default_internal_regex_instance - JsRegex.new(regex, options: 'g').to_h.slice(:source, :options).values + JsRegex.new(regex).to_h.slice(:source, :options).values end { user_internal_regex_pattern: pattern, user_internal_regex_options: options } 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 -- cgit v1.2.1 From 4a001c06e92be2c487587881b395323f62311a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Ru=CC=88ttimann?= Date: Tue, 5 Feb 2019 13:14:13 +0100 Subject: add changelog entry --- changelogs/unreleased/chore-update-js-regex.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/chore-update-js-regex.yml 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 -- cgit v1.2.1