summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-06-27 19:41:51 +0000
committerClement Ho <ClemMakesApps@gmail.com>2017-06-27 16:13:01 -0500
commitd61836103d32d51557a94658988f3a7a0b6930de (patch)
tree2fbb787395cf80ce5aed4dcc39d74c7ea0ba5dd1
parent5f5523c68a4b155f56424320e2dbf07088b351a2 (diff)
downloadgitlab-ce-d61836103d32d51557a94658988f3a7a0b6930de.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
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 257adabc201..0de8746109e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -460,7 +460,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)
multi_json (1.12.1)
multi_xml (0.6.0)