Set up Delayed Job as the backend for Active Job

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 0a137abaed5120d1e15ecf775f41012cde303394..a5431f09f09bb94ea8eb32f46e0a2dfd1d02af00 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,6 +18,9 @@ Bundler.require(*Rails.groups)
 
 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.
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading
@@ -26,6 +29,10 @@ module OpenStreetMap
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W[#{config.root}/lib]
 
+    # 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
+
     # 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
@@ -44,5 +51,8 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
+
+    # Use DelayedJob as the persistent backend for ActiveJob
+    config.active_job.queue_adapter = :delayed_job
   end
 end