Update to rails 4.2.0

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 040ce93e25dd05c8710d2e9a48d2245a6827d837..6a96b9dd6115b87c733f477285f0ee3185ef9242 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,11 +2,19 @@ require File.expand_path('../boot', __FILE__)
 
 require File.expand_path('../preinitializer', __FILE__)
 
 
 require File.expand_path('../preinitializer', __FILE__)
 

+if STATUS == :database_offline
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_model/railtie"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
+else

 require 'rails/all'
 require 'rails/all'

+end

 
 

-# If you have a Gemfile, require the gems listed there, including any gems
+# Require the gems listed in Gemfile, including any gems

 # you've limited to :test, :development, or :production.
 # you've limited to :test, :development, or :production.

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

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


@@ -14,16 +22,6 @@ module OpenStreetMap
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 

-    # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :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.
-    config.active_record.observers = :spam_observer
-

     # 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)'
     # 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)'


@@ -32,18 +30,22 @@ 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
 

-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true

 
 

-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password, :pass_crypt, :pass_crypt_confirmation]
+    # Custom directories with classes and modules you want to be autoloadable.
+    config.autoload_paths += %W(#{config.root}/lib)

 
 

-    # Use SQL instead of Active Record's schema dumper when creating the test database.
+    # 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
     # 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

-    config.active_record.schema_format = :sql
+    unless STATUS == :database_offline
+      config.active_record.schema_format = :sql
+    end
+
+    # Don't eager load models when the database is offline
+    if STATUS == :database_offline
+      config.paths["app/models"].skip_eager_load!
+    end

   end
 end
   end
 end