Merge branch 'upgrade_re2' into 'master'
Upgrade re2 to support seperate CXX and CC passing See merge request !13064
This commit is contained in:
commit
9d1b9d8972
2 changed files with 3 additions and 3 deletions
2
Gemfile
2
Gemfile
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue