From 6fb213a9619aae07cbad9aae4f73b1ff7d32ba63 Mon Sep 17 00:00:00 2001
From: Ilya Zhitomirskiy <iz268@nyu.edu>
Date: Mon, 31 Oct 2011 14:24:29 -0700
Subject: [PATCH] require false, in gemfile and require it in the app if
 configured

---
 Gemfile               | 4 ++--
 config/application.rb | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index a916a24c6..ae3649b9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,8 +77,8 @@ gem 'SystemTimer', '1.2.1', :platforms => :ruby_18
 
 gem 'hoptoad_notifier'
 
-gem 'rpm_contrib'
-gem 'newrelic_rpm'#, :require => false
+gem 'rpm_contrib', :require => false
+gem 'newrelic_rpm', :require => false
 
 #mail
 
diff --git a/config/application.rb b/config/application.rb
index d3c8ee4af..77c78e940 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,6 +18,7 @@ require 'rails/all'
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
 # use newrelic if configured via config/newrelic.yml
+require 'rpm_contrib' if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
 require 'newrelic_rpm' if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
 
 module Diaspora