Use Rails 5.2 defaults and overwrite them
We can remove the `new_framework_defaults_5_2` file by using Rails 5.2 default options and overwriting the ones we haven't enabled. We're disabling `use_authenticated_message_encryption` because, even if we don't use it, some CONSUL installations might be using it, and enabling this options would make it harder to decrypt existing encrypted messages. And we're disabling `cache_versioning` until we verify our cache keeps working and expires as expected on production environments, particularly for stats.
This commit is contained in:
@@ -8,7 +8,7 @@ Bundler.require(*Rails.groups)
|
|||||||
|
|
||||||
module Consul
|
module Consul
|
||||||
class Application < Rails::Application
|
class Application < Rails::Application
|
||||||
config.load_defaults 5.1
|
config.load_defaults 5.2
|
||||||
|
|
||||||
# Keep belongs_to fields optional by default, because that's the way
|
# Keep belongs_to fields optional by default, because that's the way
|
||||||
# Rails 4 models worked
|
# Rails 4 models worked
|
||||||
@@ -17,6 +17,14 @@ module Consul
|
|||||||
# Use local forms with `form_with`, so it works like `form_for`
|
# Use local forms with `form_with`, so it works like `form_for`
|
||||||
config.action_view.form_with_generates_remote_forms = false
|
config.action_view.form_with_generates_remote_forms = false
|
||||||
|
|
||||||
|
# Keep disabling cache versioning until we verify it's compatible
|
||||||
|
# with `:dalli_store` and with the way we cache stats
|
||||||
|
config.active_record.cache_versioning = false
|
||||||
|
|
||||||
|
# Keep using AES-256-CBC for message encryption in case it's used
|
||||||
|
# in any CONSUL installations
|
||||||
|
config.active_support.use_authenticated_message_encryption = false
|
||||||
|
|
||||||
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
|
# 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.
|
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
|
||||||
# config.time_zone = 'Central Time (US & Canada)'
|
# config.time_zone = 'Central Time (US & Canada)'
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
# Be sure to restart your server when you modify this file.
|
|
||||||
#
|
|
||||||
# This file contains migration options to ease your Rails 5.2 upgrade.
|
|
||||||
#
|
|
||||||
# Once upgraded flip defaults one by one to migrate to the new default.
|
|
||||||
#
|
|
||||||
# Read the Guide for Upgrading Ruby on Rails for more info on each option.
|
|
||||||
|
|
||||||
# Make Active Record use stable #cache_key alongside new #cache_version method.
|
|
||||||
# This is needed for recyclable cache keys.
|
|
||||||
# Rails.application.config.active_record.cache_versioning = true
|
|
||||||
|
|
||||||
# Use AES-256-GCM authenticated encryption for encrypted cookies.
|
|
||||||
# Also, embed cookie expiry in signed or encrypted cookies for increased security.
|
|
||||||
#
|
|
||||||
# This option is not backwards compatible with earlier Rails versions.
|
|
||||||
# It's best enabled when your entire app is migrated and stable on 5.2.
|
|
||||||
#
|
|
||||||
# Existing cookies will be converted on read then written with the new scheme.
|
|
||||||
Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
|
|
||||||
|
|
||||||
# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
|
|
||||||
# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
|
|
||||||
# Rails.application.config.active_support.use_authenticated_message_encryption = true
|
|
||||||
|
|
||||||
# Add default protection from forgery to ActionController::Base instead of in
|
|
||||||
# ApplicationController.
|
|
||||||
Rails.application.config.action_controller.default_protect_from_forgery = true
|
|
||||||
|
|
||||||
# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
|
|
||||||
Rails.application.config.active_support.use_sha1_digests = true
|
|
||||||
|
|
||||||
# Make `form_with` generate id attributes for any generated HTML tags.
|
|
||||||
Rails.application.config.action_view.form_with_generates_ids = true
|
|
||||||
Reference in New Issue
Block a user