diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-06 05:02:42 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-06 05:02:42 +0000 |
| commit | ae55a99f85339943489f6a5cc7976b9867751bc6 (patch) | |
| tree | 8351729414a58833d761921bc9e782436d5e3926 /Gemfile.lock | |
| parent | d8e24e9d3896443e4b46c99a9b61a59d2a1acb2e (diff) | |
| parent | 4a001c06e92be2c487587881b395323f62311a3a (diff) | |
| download | gitlab-ce-ae55a99f85339943489f6a5cc7976b9867751bc6.tar.gz | |
Merge branch 'chore/update-js-regex' into 'master'
update js_regex 2.2.1 -> 3.1
See merge request gitlab-org/gitlab-ce!24433
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 8 insertions, 4 deletions
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) |