Merge branch 'master' into openid

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 7f9343ce0b3181a57060f0f61e7005f9d38bcbf1..cf9aa1aae96fb7d3b1c29b6da0f7406d0fcd5777 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -56,7 +56,7 @@ Rails::Initializer.run do |config|
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'oauth', :version => '>= 0.3.6'
   config.gem 'httpclient'
-  config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4'
+  config.gem 'ruby-openid', :version => '>= 2.0.4', :lib => 'openid'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
 
@@ -101,7 +101,7 @@ Rails::Initializer.run do |config|
   config.active_record.schema_format = :sql
 
   # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector
+  config.active_record.observers = :spam_observer
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc