diff --git a/Gemfile b/Gemfile index cb86d7e4ba..3ea59bc92e 100644 --- a/Gemfile +++ b/Gemfile @@ -192,7 +192,6 @@ gem 'htmlentities', require: false # If you want to amend mini profiler to do the monkey patches in the railties # we are open to it. by deferring require to the initializer we can configure discourse installs without it -gem 'flamegraph', require: false gem 'rack-mini-profiler', require: ['enable_rails_patches'] gem 'unicorn', require: false, platform: :ruby diff --git a/Gemfile.lock b/Gemfile.lock index 18da8de94f..fed3f2f68b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,6 @@ GEM fast_xs (0.8.0) fastimage (2.2.0) ffi (1.14.2) - flamegraph (0.9.5) fspath (3.1.2) gc_tracer (1.5.1) globalid (0.4.2) @@ -265,7 +264,7 @@ GEM nio4r (~> 2.0) r2 (0.2.7) rack (2.2.3) - rack-mini-profiler (2.2.1) + rack-mini-profiler (2.3.0) rack (>= 1.2.0) rack-protection (2.1.0) rack @@ -472,7 +471,6 @@ DEPENDENCIES fast_blank fast_xs fastimage - flamegraph gc_tracer highline htmlentities @@ -559,4 +557,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.1.4 + 2.2.2 diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb index 86baee2e23..0f808362b4 100644 --- a/config/initializers/006-mini_profiler.rb +++ b/config/initializers/006-mini_profiler.rb @@ -3,7 +3,7 @@ # If Mini Profiler is included via gem if Rails.configuration.respond_to?(:load_mini_profiler) && Rails.configuration.load_mini_profiler require 'rack-mini-profiler' - require 'flamegraph' + require 'stackprof' begin require 'memory_profiler'