From 01694c1bd9ed66fbd690a92ab294da37d7f8aa1a Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 22 Jun 2017 15:33:17 +0000
Subject: 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
---
 Gemfile.lock | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Gemfile.lock')

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)
-- 
cgit v1.2.3