Remove workaround for fixed bug in passenger

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index cc7ef05005bc8156316c2f364afe5e366beeb6ea..48317ec2b8da312dd0f5c7090776b0579300a556 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,20 +1,20 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path("../boot", __FILE__)

 
 

-require File.expand_path('../preinitializer', __FILE__)
+require File.expand_path("../preinitializer", __FILE__)

 
 if STATUS == :database_offline
 
 if STATUS == :database_offline

-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
-require "sprockets/railtie"
-require "rails/test_unit/railtie"
+  require "action_controller/railtie"
+  require "action_mailer/railtie"
+  require "active_model/railtie"
+  require "sprockets/railtie"
+  require "rails/test_unit/railtie"

 else
 else

-require 'rails/all'
+  require "rails/all"

 end
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 end
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

-Bundler.require(:default, Rails.env)
+Bundler.require(*Rails.groups)

 
 module OpenStreetMap
   class Application < Rails::Application
 
 module OpenStreetMap
   class Application < Rails::Application


@@ -30,28 +30,23 @@ module OpenStreetMap
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 

+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true unless STATUS == :database_offline
+

     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/lib)
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/lib)
 

-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-

     # 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
     # 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
-
-    # 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'
+    config.active_record.schema_format = :sql unless STATUS == :database_offline

 
     # Don't eager load models when the database is offline
 
     # Don't eager load models when the database is offline

-    if STATUS == :database_offline
-      config.paths["app/models"].skip_eager_load!
+    config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
+
+    # Use memcached for caching if required
+    if defined?(MEMCACHE_SERVERS)
+      config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }

     end
   end
 end
     end
   end
 end