diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-07 17:45:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-07 17:45:38 +0000 |
| commit | 044fe6b3c9a66dbd17eb7d3d302afc86e5042ea0 (patch) | |
| tree | 48a17faf65e89098e1bc4ec4a211cd742a5e3856 | |
| parent | 9083fc04f1add6f7e4628cdb10fef69c6b815ef5 (diff) | |
| parent | 50a39e563e48365f23c8aaf8cfa30bdfb6ff609b (diff) | |
| download | gitlab-ce-044fe6b3c9a66dbd17eb7d3d302afc86e5042ea0.tar.gz | |
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
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/51180-update-ffi-to-1-9-25.yml | 5 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 02f30b9d686..3dce80deb87 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 2bdb1e035d8..e1295e1ff9b 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) |