X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2c837d896dfb324346578440d9376a7ea75d4f42..c6cde2653b8dbcd3345348b33619b2240f1cc905:/config/application.rb?ds=inline diff --git a/config/application.rb b/config/application.rb index 0713451e5..d510a6a7c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -14,7 +14,7 @@ end if defined?(Bundler) # If you precompile assets before deploying to production, use this line - Bundler.require *Rails.groups(:assets => %w(development test)) + Bundler.require(*Rails.groups(:assets => %w(development test))) # If you want your assets lazily compiled in production, use this line # Bundler.require(:default, :assets, Rails.env) end @@ -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)' @@ -51,17 +46,30 @@ module OpenStreetMap # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password, :pass_crypt, :pass_crypt_confirmation] + # Use SQL instead of Active Record's schema dumper when creating the database. + # This is necessary if your schema can't be completely dumped by the schema dumper, + # like if you have constraints or database-specific column types + unless STATUS == :database_offline + config.active_record.schema_format = :sql + end + + # Enforce whitelist mode for mass assignment. + # 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. + unless STATUS == :database_offline + config.active_record.whitelist_attributes = true + end + # Enable the asset pipeline config.assets.enabled = true # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - unless STATUS == :database_offline - config.active_record.schema_format = :sql + # Don't eager load models when the database is offline + if STATUS == :database_offline + config.paths["app/models"].skip_eager_load! end end end