summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2018-09-06 21:15:43 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2018-09-06 21:19:17 +0900
commit50a39e563e48365f23c8aaf8cfa30bdfb6ff609b (patch)
treeffe2df73a517e4f3b89b3b4883f8807ad657ce5b
parent0bbea6da1886b61f8612c2c38fd1c08e1632073e (diff)
downloadgitlab-ce-50a39e563e48365f23c8aaf8cfa30bdfb6ff609b.tar.gz
Update ffi to 1.9.25
-rw-r--r--Gemfile.lock2
-rw-r--r--Gemfile.rails5.lock2
-rw-r--r--changelogs/unreleased/51180-update-ffi-to-1-9-25.yml5
-rw-r--r--qa/Gemfile.lock2
4 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e7ab97fb299..aa39e7c8542 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 1a1aac9f439..08f0f685101 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -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)
diff --git a/changelogs/unreleased/51180-update-ffi-to-1-9-25.yml b/changelogs/unreleased/51180-update-ffi-to-1-9-25.yml
new file mode 100644
index 00000000000..67354d6a610
--- /dev/null
+++ b/changelogs/unreleased/51180-update-ffi-to-1-9-25.yml
@@ -0,0 +1,5 @@
+---
+title: Update ffi to 1.9.25
+merge_request: 21561
+author: Takuya Noguchi
+type: other
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 8f523e55adc..8d28fcacc05 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -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)