diff --git a/Gemfile b/Gemfile index 8414961a6d4..997e7c42bea 100644 --- a/Gemfile +++ b/Gemfile @@ -197,10 +197,7 @@ gem "rack-mini-profiler", require: ["enable_rails_patches"] gem "unicorn", require: false, platform: :ruby gem "puma", require: false -# Pin to 0.4.14 for now because 0.5.0 is broken. -# It has been fixed in https://github.com/tmm1/rbtrace/commit/1c674885694c6f2cb935eeccb0591feeb67679cf but we are waiting -# for a new release to be published. -gem "rbtrace", "0.4.14", require: false, platform: :mri +gem "rbtrace", require: false, platform: :mri gem "gc_tracer", require: false, platform: :mri diff --git a/Gemfile.lock b/Gemfile.lock index e63123dd6e8..efa5099e996 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,7 +356,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbtrace (0.4.14) + rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) @@ -627,7 +627,7 @@ DEPENDENCIES railties rake rb-fsevent - rbtrace (= 0.4.14) + rbtrace rchardet redcarpet redis