diff --git a/Gemfile b/Gemfile index 481da339b..bcdad52b9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source 'http://rubygems.org' -gem 'memprof', '0.3.6' gem 'mysql2', '0.2.6' gem 'rails', '3.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index dc207a778..caf1b40fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,9 +215,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - memprof (0.3.6) - rest-client (>= 1.4.2) - term-ansicolor mime-types (1.16) mini_magick (3.2) subexec (~> 0.0.4) @@ -419,7 +416,6 @@ DEPENDENCIES jasmine! json (= 1.4.6) launchy - memprof (= 0.3.6) mini_magick (= 3.2) mongrel mysql2 (= 0.2.6) diff --git a/config.ru b/config.ru index 043fe8ecd..57b12ff35 100644 --- a/config.ru +++ b/config.ru @@ -7,7 +7,5 @@ require ::File.expand_path('../config/environment', __FILE__) require ::File.expand_path('../lib/chrome_frame', __FILE__) -require 'memprof/middleware' -use Memprof::Middleware use Rack::ChromeFrame, :minimum => 8 run Diaspora::Application