Implement long URL option, toggling, and labeling for share

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 25df04b448683afaee2c4214e6774be87e785217..d510a6a7c3ed31bc2f756baaf85d9bd95f959a0f 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,11 +32,6 @@ module OpenStreetMap
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
-    # Activate observers that should always be running.
-    unless STATUS == :database_offline
-      config.active_record.observers = :spam_observer
-    end
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -62,7 +57,9 @@ module OpenStreetMap
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    unless STATUS == :database_offline
+      config.active_record.whitelist_attributes = true
+    end
 
     # Enable the asset pipeline
     config.assets.enabled = true