Revert "require false, in gemfile and require it in the app if configured"

This reverts commit 6fb213a961.
This commit is contained in:
Ilya Zhitomirskiy 2011-10-31 15:11:49 -07:00
parent 60c4e13435
commit d868b79937
2 changed files with 2 additions and 3 deletions

View file

@ -77,8 +77,8 @@ gem 'SystemTimer', '1.2.1', :platforms => :ruby_18
gem 'hoptoad_notifier'
gem 'rpm_contrib', :require => false
gem 'newrelic_rpm', :require => false
gem 'rpm_contrib'
gem 'newrelic_rpm'#, :require => false
#mail

View file

@ -18,7 +18,6 @@ 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