diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-06-07 20:12:24 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-06-07 20:12:24 +0200 |
| commit | 48033eaa4e7e4c517d81a609ea17bbee81528d4d (patch) | |
| tree | e5a155fdca76d33ce91b54baa1ec80d3fcf85257 /railties/lib | |
| parent | 1ffa9aa2846b1eed68b3cd01bc47a570e57c03e3 (diff) | |
| download | rails-48033eaa4e7e4c517d81a609ea17bbee81528d4d.tar.gz rails-48033eaa4e7e4c517d81a609ea17bbee81528d4d.tar.bz2 rails-48033eaa4e7e4c517d81a609ea17bbee81528d4d.zip | |
Flag `to_time` + simplify version names.
Since Ruby 2.4 isn't out yet, the fact that it will make `to_time` preserve the
time zone should be toggled with a update flag.
Second, remove the flipping on what version had what defaults. It's called new
framework defaults, so it's from the future looking. Thus keep the line that
mentions past versions.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt index 13e2685a46..991963b65e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt @@ -9,22 +9,23 @@ # Read the Rails 5.0 release notes for more info on each option. <%- unless options[:api] -%> -# Enable per-form CSRF tokens. <%= options[:update] ? 'Next major version defaults to true.' : 'Previous versions had false.' %> +# Enable per-form CSRF tokens. Previous versions had false. Rails.application.config.action_controller.per_form_csrf_tokens = <%= options[:update] ? false : true %> -# Enable origin-checking CSRF mitigation. <%= options[:update] ? 'Next major version defaults to true.' : 'Previous versions had false.' %> +# Enable origin-checking CSRF mitigation. Previous versions had false. Rails.application.config.action_controller.forgery_protection_origin_check = <%= options[:update] ? false : true %> <%- end -%> # Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. -ActiveSupport.to_time_preserves_timezone = true +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = <%= options[:update] ? false : true %> <%- unless options[:skip_active_record] -%> -# Require `belongs_to` associations by default. <%= options[:update] ? 'Next major version defaults to true.' : 'Previous versions had false.' %> +# Require `belongs_to` associations by default. Previous versions had false. Rails.application.config.active_record.belongs_to_required_by_default = <%= options[:update] ? false : true %> <%- end -%> -# Do not halt callback chains when a callback returns false. <%= options[:update] ? 'Next major version defaults to false.' : 'Previous versions had true.' %> +# Do not halt callback chains when a callback returns false. Previous versions had true. ActiveSupport.halt_callback_chains_on_return_false = <%= options[:update] ? true : false %> <%- unless options[:update] -%> |