X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be35d4ab9cfc7e18df1b3d4f2d58d8aea1eb8f4c..08597488159ca534ee6a3469712515e4760a0f99:/config/application.rb

diff --git a/config/application.rb b/config/application.rb
index b6e2ba467..5139111cc 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,13 +18,21 @@ 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 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.
     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