diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-25 15:50:22 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-25 15:50:22 +0000 |
commit | 9d1b9d8972a34efdaf4c2bc0262cac96b0aa39bc (patch) | |
tree | 93ac7a8f1916461729c34977f245b67bb33ee88f /Gemfile | |
parent | ba24fa87d1d8e70b8d187ae55feaf49dc58da4fd (diff) | |
parent | 2f0a4243d5e7d848172a8adfa72084eb4d07c60b (diff) | |
download | gitlab-ce-9d1b9d8972a34efdaf4c2bc0262cac96b0aa39bc.tar.gz |
Merge branch 'upgrade_re2' into 'master'
Upgrade re2 to support seperate CXX and CC passing
See merge request !13064
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 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 |