Merge branch '51180-update-ffi-to-1.9.25' into 'master'

Update ffi to 1.9.25

Closes #51180

See merge request gitlab-org/gitlab-ce!21561
This commit is contained in:
Robert Speicher 2018-09-07 17:45:38 +00:00
commit 044fe6b3c9
4 changed files with 8 additions and 3 deletions

View File

@ -208,7 +208,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.4.0)
ffi (1.9.18)
ffi (1.9.25)
flipper (0.13.0)
flipper-active_record (0.13.0)
activerecord (>= 3.2, < 6)

View File

@ -211,7 +211,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.4.0)
ffi (1.9.18)
ffi (1.9.25)
flipper (0.13.0)
flipper-active_record (0.13.0)
activerecord (>= 3.2, < 6)

View File

@ -0,0 +1,5 @@
---
title: Update ffi to 1.9.25
merge_request: 21561
author: Takuya Noguchi
type: other

View File

@ -32,7 +32,7 @@ GEM
diff-lcs (1.3)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
ffi (1.9.18)
ffi (1.9.25)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.9.1)