From ba010833c72aa964d83eda9bd722be4106eb641d Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 24 Jan 2012 12:40:07 -0800
Subject: [PATCH] move newrelic and airbrake out of any group, as it is not
 loading at all if it is in any bundler group #confused

---
 Gemfile                         | 7 ++-----
 Gemfile.lock                    | 2 +-
 config/initializers/airbrake.rb | 6 ++----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2c4e4d72b..9c2d0fba3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,14 +25,11 @@ gem 'twitter', '2.0.2'
 # mail
 
 gem 'messagebus_ruby_api', '1.0.3'
+gem 'airbrake'
+gem 'newrelic_rpm'
 
 group :production do # we don't install these on travis to speed up test runs
   gem 'rack-ssl', :require => 'rack/ssl'
-end
-
-group :reporting do
-  gem 'airbrake'
-  gem 'newrelic_rpm'
   gem 'rack-google-analytics', :require => 'rack/google-analytics'
   gem 'rack-piwik', :require => 'rack/piwik'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index bc55d6eef..f9eca5a48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,7 +186,7 @@ GEM
     heroku_san (1.3.0)
       heroku (>= 2)
       rails (>= 2)
-    highline (1.6.9)
+    highline (1.6.11)
     http_accept_language (1.0.2)
     i18n (0.5.0)
     i18n-inflector (2.6.3)
diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb
index 5e0d4ef1d..920032308 100644
--- a/config/initializers/airbrake.rb
+++ b/config/initializers/airbrake.rb
@@ -5,9 +5,7 @@
 if AppConfig[:airbrake_api_key].present?
   require 'airbrake'
   Airbrake.configure do |config|
+    puts AppConfig[:airbrake_api_key]
     config.api_key = AppConfig[:airbrake_api_key]
   end
-
-
-  Rails.application.config.middleware.insert_before 1, Airbrake::Rack
-end
+end
\ No newline at end of file