diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-22 15:33:17 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-19 22:28:41 -0500 |
| commit | ba60d4f6e4f3a6d3cb56c9320f475bee8f0b38da (patch) | |
| tree | 51245b9a3f7df6df3e396f3335f88d79f5d2f328 /Gemfile.lock | |
| parent | ceda6bd5a6d5e7b24f0ec003ce2e7b446d0917c0 (diff) | |
| download | gitlab-ce-ba60d4f6e4f3a6d3cb56c9320f475bee8f0b38da.tar.gz | |
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 52409000d3f..dfa7acc8917 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -657,6 +657,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) @@ -1056,6 +1057,7 @@ DEPENDENCIES raindrops (~> 0.18) rblineprof (~> 0.3.6) rdoc (~> 4.2) + re2 (~> 1.0.0) recaptcha (~> 3.0) redcarpet (~> 3.4) redis (~> 3.2) |