diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-22 18:33:17 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-19 15:55:10 +0300 |
| commit | 01694c1bd9ed66fbd690a92ab294da37d7f8aa1a (patch) | |
| tree | 05f657bcc26c9a50e8135a84f64eaaf11569b018 /Gemfile.lock | |
| parent | dd38cff3cfdb7e2006535e177813a71cc339ff18 (diff) | |
Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'
24570 use re2 for user supplied regexp 9 3
See merge request !2129
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 674ecdc5427..aa71ab91c34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -656,6 +656,7 @@ GEM debugger-ruby_core_source (~> 1.3) rdoc (4.2.2) json (~> 1.4) + re2 (1.0.0) recaptcha (3.0.0) json recursive-open-struct (1.0.0) @@ -1053,6 +1054,7 @@ DEPENDENCIES rainbow (~> 2.1.0) rblineprof (~> 0.3.6) rdoc (~> 4.2) + re2 (~> 1.0.0) recaptcha (~> 3.0) redcarpet (~> 3.4) redis (~> 3.2) |