Merge branch 'master' into openstreetbugs

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 1289dd2fa8b5f936d149106b7477835c5033792f..53dfabb6a94ebcc44107853bdd5727d925ddf0f5 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -55,7 +55,6 @@ Rails::Initializer.run do |config|
   config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'oauth', :version => '>= 0.3.6'
-  config.gem 'oauth-plugin'
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
@@ -99,4 +98,5 @@ Rails::Initializer.run do |config|
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
+
 end