diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-25 18:50:22 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-25 18:50:22 +0300 |
commit | 9d1b9d8972a34efdaf4c2bc0262cac96b0aa39bc (patch) | |
tree | 93ac7a8f1916461729c34977f245b67bb33ee88f | |
parent | ba24fa87d1d8e70b8d187ae55feaf49dc58da4fd (diff) | |
parent | 2f0a4243d5e7d848172a8adfa72084eb4d07c60b (diff) |
Merge branch 'upgrade_re2' into 'master'
Upgrade re2 to support seperate CXX and CC passing
See merge request !13064
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -165,7 +165,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 1f3d6d2d618..901e5334994 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -660,7 +660,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) @@ -1060,7 +1060,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) |