summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-08-10 23:23:49 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-08-10 23:23:49 +0000
commit01b736fb050cf5375ca23785731831f4d3ad08c9 (patch)
tree58a3b1bcfd29c98ea51d83ee88486407a92a7e20
parentea671dec7f9db06c1d45ddd1536c1af194de8f62 (diff)
parent3b5dab8e77ec691ccfc919a0bdc5fca628a6f463 (diff)
downloadgitlab-ce-01b736fb050cf5375ca23785731831f4d3ad08c9.tar.gz
Merge branch 'sh-update-ffi' into 'master'
Update ffi gem to 1.11.1 See merge request gitlab-org/gitlab-ce!31686
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 80f36a9457c..a74492dadc1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -236,7 +236,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
- ffi (1.10.0)
+ ffi (1.11.1)
flipper (0.13.0)
flipper-active_record (0.13.0)
activerecord (>= 3.2, < 6)