Avoid to define an initializer after the load_config_initializers

This make the config/initializers run before the railties are loaded
what can break some configurations.

3 files changed, 9 insertions, 8 deletions

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 9af3f8b447..588d6c49f9 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -73,6 +73,14 @@ module ActiveSupport
   end
 
   cattr_accessor :test_order # :nodoc:
+
+  def self.halt_callback_chains_on_return_false
+    Callbacks::CallbackChain.halt_and_display_warning_on_return_false
+  end
+
+  def self.halt_callback_chains_on_return_false=(value)
+    Callbacks::CallbackChain.halt_and_display_warning_on_return_false = value
+  end
 end
 
 autoload :I18n, "active_support/i18n"
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index ef22433491..cd0fb51009 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -13,13 +13,6 @@ module ActiveSupport
       end
     end
 
-    initializer "active_support.halt_callback_chains_on_return_false", after: :load_config_initializers do |app|
-      if app.config.active_support.key? :halt_callback_chains_on_return_false
-        ActiveSupport::Callbacks::CallbackChain.halt_and_display_warning_on_return_false = \
-          app.config.active_support.halt_callback_chains_on_return_false
-      end
-    end
-
     # Sets the default value for Time.zone
     # If assigned value cannot be matched to a TimeZone, an exception will be raised.
     initializer "active_support.initialize_time_zone" do |app|
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb
index e63022da91..a70a1b9cde 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb
@@ -1,4 +1,4 @@
 # Be sure to restart your server when you modify this file.
 
 # Do not halt callback chains when a callback returns false.
-Rails.application.config.active_support.halt_callback_chains_on_return_false = false
+ActiveSupport.halt_callback_chains_on_return_false = false