Merge pull request #4141 from consul/load_defaults

Use Rails 5 default settings

config/application.rb

@@ -8,9 +8,14 @@ Bundler.require(*Rails.groups)
 
 module Consul
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
+    config.load_defaults 5.1
-    # Application configuration should go into files in config/initializers
+
-    # -- all .rb files in that directory are automatically loaded.
+    # Keep belongs_to fields optional by default, because that's the way
+    # Rails 4 models worked
+    config.active_record.belongs_to_required_by_default = false
+
+    # Use local forms with `form_with`, so it works like `form_for`
+    config.action_view.form_with_generates_remote_forms = false
 
     # 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/environments/development.rb

@@ -46,10 +46,6 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.

config/environments/preproduction.rb

@@ -36,10 +36,6 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.

config/environments/production.rb

@@ -30,10 +30,6 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.

config/environments/staging.rb

@@ -36,10 +36,6 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.