summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-06-22 15:33:17 +0000
committerMike Greiling <mike@pixelcog.com>2017-07-19 22:28:41 -0500
commitba60d4f6e4f3a6d3cb56c9320f475bee8f0b38da (patch)
tree51245b9a3f7df6df3e396f3335f88d79f5d2f328 /Gemfile
parentceda6bd5a6d5e7b24f0ec003ce2e7b446d0917c0 (diff)
downloadgitlab-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')
-rw-r--r--Gemfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 57d2274b4b6..da66651b894 100644
--- a/Gemfile
+++ b/Gemfile
@@ -163,6 +163,9 @@ gem 'rainbow', '~> 2.2'
# GitLab settings
gem 'settingslogic', '~> 2.0.9'
+# Linear-time regex library for untrusted regular expressions
+gem 're2', '~> 1.0.0'
+
# Misc
gem 'version_sorter', '~> 2.1.0'