summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Groeneveld <frank@ivaldi.nl>2017-07-25 08:29:04 +0200
committerFrank Groeneveld <frank@ivaldi.nl>2017-07-25 08:29:04 +0200
commit2f0a4243d5e7d848172a8adfa72084eb4d07c60b (patch)
tree4c03ab63381274f2a5a3f004618ed85f76121b7b
parentd964816b9fe56679ffc0b331e701f7b24db5c6a9 (diff)
downloadgitlab-ce-2f0a4243d5e7d848172a8adfa72084eb4d07c60b.tar.gz
Upgrade re2 to support seperate CXX and CC passing
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 5758b1b554e..8b32a60818a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -164,7 +164,7 @@ gem 'rainbow', '~> 2.2'
gem 'settingslogic', '~> 2.0.9'
# Linear-time regex library for untrusted regular expressions
-gem 're2', '~> 1.1.0'
+gem 're2', '~> 1.1.1'
# Misc
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ffff0d8735..a64805ad6bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -656,7 +656,7 @@ GEM
debugger-ruby_core_source (~> 1.3)
rdoc (4.2.2)
json (~> 1.4)
- re2 (1.1.0)
+ re2 (1.1.1)
recaptcha (3.0.0)
json
recursive-open-struct (1.0.0)
@@ -1055,7 +1055,7 @@ DEPENDENCIES
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
rdoc (~> 4.2)
- re2 (~> 1.1.0)
+ re2 (~> 1.1.1)
recaptcha (~> 3.0)
redcarpet (~> 3.4)
redis (~> 3.2)