Add SotM 2018 banner

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 3220ab5916fea0717ca2316debb051d9496ef590..5139111cc8460dce6bb65d296ff8b84b2c82c37e 100644 (file)
--- 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
@@ -43,8 +51,5 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
-
-    # Set the host and protocol for all action mailer urls
-    config.action_mailer.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }
   end
 end