diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-24 11:52:15 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-24 11:52:15 +0000 |
| commit | 3d3951a2ae1a5c23d373689ee4c96ed973320ae6 (patch) | |
| tree | c3a8f1c4f757e3f6a17fccfd7f70d62888913bce /Gemfile.lock | |
| parent | 5a9554bb338bec4b31b0e712ae07898235f7a69d (diff) | |
| parent | 61f948baed18788c2bb34dd6d5da452a19f58e52 (diff) | |
| download | gitlab-ce-3d3951a2ae1a5c23d373689ee4c96ed973320ae6.tar.gz | |
Merge branch 'upgrade-re2' into 'master'
Upgrade the re2 gem to 1.1.0
See merge request !13036
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b0b437ae342..f8aaba57998 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.0.0) + re2 (1.1.0) 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.0.0) + re2 (~> 1.1.0) recaptcha (~> 3.0) redcarpet (~> 3.4) redis (~> 3.2) |