diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-08-21 11:23:04 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-08-21 11:23:04 +0300 |
| commit | b2e2ec1069625c4a4f220b0ec72154b1f2bdf834 (patch) | |
| tree | db53f7fb52bbe3d0137639bedcc1cff0dcf59142 | |
| parent | 1408656312022cd87497c56e15b9d7137b2dc3d8 (diff) | |
| parent | eef238f0c98192751d6f1daa7c394ea5c6cb1d29 (diff) | |
Merge branch 'sh-update-rbtrace' into 'master'
Update rbtrace gem to v0.4.14
See merge request gitlab-org/gitaly!2491
| -rw-r--r-- | changelogs/unreleased/sh-update-rbtrace.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/changelogs/unreleased/sh-update-rbtrace.yml b/changelogs/unreleased/sh-update-rbtrace.yml new file mode 100644 index 000000000..dfea4a13d --- /dev/null +++ b/changelogs/unreleased/sh-update-rbtrace.yml @@ -0,0 +1,5 @@ +--- +title: Update rbtrace gem to v0.4.14 +merge_request: 2491 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 52f7acd3c..81ae62035 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -47,7 +47,7 @@ GEM activesupport (>= 4.2.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.12.2) + ffi (1.13.1) gemojione (3.3.0) json github-linguist (7.9.0) @@ -106,14 +106,14 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) - msgpack (1.3.1) + msgpack (1.3.3) multipart-post (2.0.0) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri opentracing (0.5.0) - optimist (3.0.0) + optimist (3.0.1) parallel (1.17.0) parser (2.7.0.5) ast (~> 2.4.0) @@ -135,7 +135,7 @@ GEM rails-html-sanitizer (1.3.0) loofah (~> 2.3) rainbow (3.0.0) - rbtrace (0.4.11) + rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) |