Update Potlatch 2 to 2.5-57-gaa163622 build

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 040ce93e25dd05c8710d2e9a48d2245a6827d837..5139111cc8460dce6bb65d296ff8b84b2c82c37e 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,49 +1,55 @@
-require File.expand_path('../boot', __FILE__)
-
-require File.expand_path('../preinitializer', __FILE__)
-
-require 'rails/all'
+require_relative "boot"
+
+require_relative "preinitializer"
+
+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"
+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

+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+

     # Settings in config/environments/* take precedence over those specified here.
     # Settings in config/environments/* take precedence over those specified here.

-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.

 
     # Custom directories with classes and modules you want to be autoloadable.
 
     # 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
+    config.autoload_paths += %W[#{config.root}/lib]

 
 

-    # 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)'
+    # This defaults to true from rails 5.0 but our code doesn't comply
+    # with it at all so we turn it off
+    config.active_record.belongs_to_required_by_default = false

 
 

-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # 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)
+    # 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
+    config.active_record.schema_format = :sql unless STATUS == :database_offline

 
 

-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    # Don't eager load models when the database is offline
+    config.paths["app/models"].skip_eager_load! if STATUS == :database_offline

 
 

-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password, :pass_crypt, :pass_crypt_confirmation]
+    # Use memcached for caching if required
+    config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS)

 
 

-    # 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
-    config.active_record.schema_format = :sql
+    # Use logstash for logging if required
+    if defined?(LOGSTASH_PATH)
+      config.logstasher.enabled = true
+      config.logstasher.suppress_app_log = false
+      config.logstasher.logger_path = LOGSTASH_PATH
+      config.logstasher.log_controller_parameters = true
+    end

   end
 end
   end
 end