diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-08-13 21:27:22 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-08-13 21:27:22 +0300 |
| commit | de79eca45626d14ff1283ec712bc6e040d00620c (patch) | |
| tree | 7114a7dc01a08abce0f86f5d598cb670e63c9b12 | |
| parent | 25b16d1828c5790e56a8a36fd78d87158233d60f (diff) | |
| parent | 7aeb3c9eb1067322ae73e4e9731e0ae05264bc4e (diff) | |
Merge branch 'sh-update-ffi-gem' into 'master'
Update ffi gem to 1.11.1
See merge request gitlab-org/gitaly!1413
| -rw-r--r-- | changelogs/unreleased/sh-update-ffi-gem.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-update-ffi-gem.yml b/changelogs/unreleased/sh-update-ffi-gem.yml new file mode 100644 index 000000000..91f0ee50a --- /dev/null +++ b/changelogs/unreleased/sh-update-ffi-gem.yml @@ -0,0 +1,5 @@ +--- +title: Update ffi gem to 1.11.1 +merge_request: +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 69d70e98a..4afd92408 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -46,7 +46,7 @@ GEM activesupport (>= 4.2.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.10.0) + ffi (1.11.1) gemojione (3.3.0) json github-linguist (6.4.1) |