diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-18 10:18:11 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-18 10:18:11 +0000 |
| commit | c9504df601566a4a1cff5b1383a2e994c104e210 (patch) | |
| tree | e1096ca6fbea4b98d670560c932416a3ac34fd38 | |
| parent | 35c3cb7c480e812d3c6dcd8f8e2eb6c6a2da83b1 (diff) | |
| parent | a6023c89173842b9519f68936948096c6d89abfb (diff) | |
| download | gitlab-ce-c9504df601566a4a1cff5b1383a2e994c104e210.tar.gz | |
Merge branch 'sh-bump-rbtrace-version' into 'master'
Bump rbtrace version to 0.4.11
See merge request gitlab-org/gitlab-ce!24476
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 53f9e97f082..419a6831924 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,7 +206,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -470,7 +470,7 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -551,6 +551,7 @@ GEM nokogiri (>= 1.4.4) omniauth (~> 1.0) opentracing (0.4.3) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) @@ -672,10 +673,10 @@ GEM ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) recaptcha (3.0.0) @@ -882,7 +883,6 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) |