From 212ece3e80b096ca580dd549aa9b486fdcd82ab5 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 10 Feb 2014 15:40:32 +1100 Subject: [PATCH] Remove memory profiler at least until I push a new docker image --- Gemfile | 5 ----- config/initializers/06-mini_profiler.rb | 1 - 2 files changed, 6 deletions(-) diff --git a/Gemfile b/Gemfile index db5f13de315..698477e358c 100644 --- a/Gemfile +++ b/Gemfile @@ -196,11 +196,6 @@ gem 'lru_redux' gem 'flamegraph', require: false gem 'rack-mini-profiler', require: false -begin - gem 'memory_profiler', require: false, platform: :mri_21 -rescue - puts "WARNING: you are running an old version of bundler, please run 'gem update bundler'" -end # used for caching, optional gem 'rack-cors', require: false diff --git a/config/initializers/06-mini_profiler.rb b/config/initializers/06-mini_profiler.rb index 34d6193ce39..8c5f385f7c5 100644 --- a/config/initializers/06-mini_profiler.rb +++ b/config/initializers/06-mini_profiler.rb @@ -2,7 +2,6 @@ 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