diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-27 19:41:51 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-27 19:41:51 +0000 |
commit | aa1b3ae6063d6221fd14e0bd046876b22c87741a (patch) | |
tree | 0de3c1be0a3d6567663a289cd70c61624598d744 /Gemfile.lock | |
parent | dfad12ed0d1eaf4e61b63cced4a844b4b584e90f (diff) | |
parent | 9c2a51a6cda78b055f7e9308f7c045eac781ff4f (diff) | |
download | gitlab-ce-aa1b3ae6063d6221fd14e0bd046876b22c87741a.tar.gz |
Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master'
Update mmap2 gem to fix missing symbol error that happens on some installations from source
Closes #34221
See merge request !12492
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 865d13c6f53..f4ddd30da1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -463,7 +463,7 @@ GEM mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) - mmap2 (2.2.6) + mmap2 (2.2.7) mousetrap-rails (1.4.6) msgpack (1.1.0) multi_json (1.12.1) |