Commit 60a08fe7 authored by Imre Farkas's avatar Imre Farkas

Merge branch 'pravi/gitlab-update-js-regex' into 'master'

Update js_regex 3.1 to 3.4

See merge request gitlab-org/gitlab!37418
parents ee8f1882 a142cb9f
...@@ -214,7 +214,7 @@ gem 're2', '~> 1.2.0' ...@@ -214,7 +214,7 @@ gem 're2', '~> 1.2.0'
gem 'version_sorter', '~> 2.2.4' gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1' gem 'js_regex', '~> 3.4'
# User agent parsing # User agent parsing
gem 'device_detector' gem 'device_detector'
......
...@@ -149,7 +149,7 @@ GEM ...@@ -149,7 +149,7 @@ GEM
activemodel (>= 4.0.0) activemodel (>= 4.0.0)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
mime-types (>= 1.16) mime-types (>= 1.16)
character_set (1.1.2) character_set (1.4.0)
charlock_holmes (0.7.6) charlock_holmes (0.7.6)
childprocess (3.0.0) childprocess (3.0.0)
chunky_png (1.3.5) chunky_png (1.3.5)
...@@ -562,9 +562,9 @@ GEM ...@@ -562,9 +562,9 @@ GEM
multipart-post multipart-post
oauth (~> 0.5, >= 0.5.0) oauth (~> 0.5, >= 0.5.0)
jmespath (1.4.0) jmespath (1.4.0)
js_regex (3.1.1) js_regex (3.4.0)
character_set (~> 1.1) character_set (~> 1.4)
regexp_parser (~> 1.1) regexp_parser (~> 1.5)
regexp_property_values (~> 0.3) regexp_property_values (~> 0.3)
json (2.3.0) json (2.3.0)
json-jwt (1.11.0) json-jwt (1.11.0)
...@@ -889,7 +889,7 @@ GEM ...@@ -889,7 +889,7 @@ GEM
redis-store (1.8.1) redis-store (1.8.1)
redis (>= 4, < 5) redis (>= 4, < 5)
regexp_parser (1.5.1) regexp_parser (1.5.1)
regexp_property_values (0.3.4) regexp_property_values (0.3.5)
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)
...@@ -1291,7 +1291,7 @@ DEPENDENCIES ...@@ -1291,7 +1291,7 @@ DEPENDENCIES
icalendar icalendar
invisible_captcha (~> 0.12.1) invisible_captcha (~> 0.12.1)
jira-ruby (~> 2.0.0) jira-ruby (~> 2.0.0)
js_regex (~> 3.1) js_regex (~> 3.4)
json (~> 2.3.0) json (~> 2.3.0)
json-schema (~> 2.8.0) json-schema (~> 2.8.0)
jwt (~> 2.1.0) jwt (~> 2.1.0)
......
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