Provide a unique point for running initializers.

2 files changed, 6 insertions, 1 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index e95b0f5495..9e1a5be358 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -11,7 +11,7 @@ module Rails
                     :force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
                     :ssl_options, :static_cache_control, :session_options,
-                    :time_zone, :whiny_nils, :railties_order
+                    :time_zone, :whiny_nils, :railties_order, :all_initializers
 
       attr_writer :log_level
       attr_reader :encoding
@@ -36,6 +36,7 @@ module Rails
         @generators                  = app_generators
         @cache_store                 = [ :file_store, "#{root}/tmp/cache/" ]
         @railties_order              = [:all]
+        @all_initializers            = []
 
         @assets = ActiveSupport::OrderedOptions.new
         @assets.enabled                  = false
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index df2853498a..9c25e05ee5 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -4,6 +4,10 @@ module Rails
       include Initializable
       $rails_rake_task = nil
 
+      initializer :load_config_initializers do
+        config.all_initializers.each { |init| load(init) }
+      end
+
       initializer :add_generator_templates do
         config.generators.templates.unshift(*paths["lib/templates"].existent)
       end