diff --git a/Gemfile b/Gemfile index 64b187eb4..787405b0a 100644 --- a/Gemfile +++ b/Gemfile @@ -76,7 +76,6 @@ gem 'SystemTimer', '1.2.1', :platforms => :ruby_18 gem 'hoptoad_notifier' gem 'newrelic_rpm', :require => false -gem 'rpm_contrib', :require => false # tags diff --git a/Gemfile.lock b/Gemfile.lock index e487b02c0..0eb89e4b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -378,8 +378,6 @@ GEM resque (~> 1.0) rest-client (1.6.1) mime-types (>= 1.16) - rpm_contrib (2.1.4) - newrelic_rpm (>= 3.1.1) rspec (2.6.0) rspec-core (~> 2.6.0) rspec-expectations (~> 2.6.0) @@ -527,7 +525,6 @@ DEPENDENCIES resque-timeout (= 1.0.0) rest-client (= 1.6.1) roxml! - rpm_contrib rspec (>= 2.0.0) rspec-core (= 2.6.0) rspec-instafail (>= 0.1.7) diff --git a/config/application.rb b/config/application.rb index 77c78e940..d3c8ee4af 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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