diff --git a/Gemfile b/Gemfile index f34a0a3db76..bd91d857c5f 100644 --- a/Gemfile +++ b/Gemfile @@ -221,6 +221,7 @@ gem 'ruby-readability', require: false gem 'simple-rss', require: false gem 'gctools', require: false, platform: :mri_21 gem 'stackprof', require: false, platform: :mri_21 +gem 'memory_profiler', require: false, platform: :mri_21 # This silly path comment just makes it easier for me to do dev # will be removed in a few weeks diff --git a/Gemfile.lock b/Gemfile.lock index e9da04ea3fb..5f1732a0701 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,6 +155,7 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) + memory_profiler (0.0.4) message_bus (0.9.4) eventmachine rack (>= 1.1.3) @@ -418,6 +419,7 @@ DEPENDENCIES listen (= 0.7.3) logster lru_redux + memory_profiler message_bus minitest mocha diff --git a/config/initializers/06-mini_profiler.rb b/config/initializers/06-mini_profiler.rb index 2e7a6a09a5c..d3158f0684f 100644 --- a/config/initializers/06-mini_profiler.rb +++ b/config/initializers/06-mini_profiler.rb @@ -2,6 +2,7 @@ if Rails.configuration.respond_to?(:enable_mini_profiler) && Rails.configuration.enable_mini_profiler require 'rack-mini-profiler' require 'flamegraph' + require 'memory_profiler' if RUBY_VERSION >= "2.1.0" # initialization is skipped so trigger it Rack::MiniProfilerRails.initialize!(Rails.application) end