diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-02-08 11:06:19 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 11:06:19 -0300 |
| commit | 47113df0341cd7bf56056bc666527978c586c7c5 (patch) | |
| tree | 9c6ecd05cb4201495be33a352181f467c49833b5 /railties | |
| parent | 25c6f4c947450c75c5a43ded19d7b6ca8b7c95b6 (diff) | |
| parent | 70e8fed5a36484ea602c318be74079b58dc543d0 (diff) | |
| download | rails-47113df0341cd7bf56056bc666527978c586c7c5.tar.gz rails-47113df0341cd7bf56056bc666527978c586c7c5.tar.bz2 rails-47113df0341cd7bf56056bc666527978c586c7c5.zip | |
Merge pull request #27940 from y-yagi/deprecate_halt_callback_chains_on_return_false
deprecate `halt_callback_chains_on_return_false` instead of `halt_and_display_warning_on_return_false`
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt | 3 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
2 files changed, 0 insertions, 4 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 3ad3eba98a..bd844f0503 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 @@ -24,9 +24,6 @@ ActiveSupport.to_time_preserves_timezone = <%= options[:update] ? false : true % # 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. Previous versions had true. -ActiveSupport.halt_callback_chains_on_return_false = <%= options[:update] ? true : false %> <%- unless options[:update] -%> # Configure SSL options to enable HSTS with subdomains. Previous versions had false. diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index e80c253ec9..ce29d93d6e 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -208,7 +208,6 @@ class AppGeneratorTest < Rails::Generators::TestCase quietly { generator.send(:update_config_files) } assert_file "#{app_root}/config/initializers/new_framework_defaults.rb" do |content| - assert_match(/ActiveSupport\.halt_callback_chains_on_return_false = true/, content) assert_match(/Rails\.application\.config.active_record\.belongs_to_required_by_default = false/, content) assert_no_match(/Rails\.application\.config\.ssl_options/, content) end |