aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-13 08:49:04 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-13 08:52:52 +0100
commit11aa167e239a85513d00a7910446bedf7b1f7800 (patch)
tree3e6471b5761f74e22fc58101160c239b68c7ffd3 /railties/lib/rails/application
parent810837dda890a5bc5d0b4d65b973ca0ccc9465bd (diff)
downloadrails-11aa167e239a85513d00a7910446bedf7b1f7800.tar.gz
rails-11aa167e239a85513d00a7910446bedf7b1f7800.tar.bz2
rails-11aa167e239a85513d00a7910446bedf7b1f7800.zip
Revert "Provide a unique point for running initializers."
This reverts commit c2e3ce8d1e1174e66536d59d8d97eb2cc8ce6f25. Conflicts: railties/lib/rails/application/configuration.rb railties/lib/rails/application/finisher.rb railties/lib/rails/engine.rb
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/configuration.rb3
-rw-r--r--railties/lib/rails/application/finisher.rb4
2 files changed, 1 insertions, 6 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 39d66ecc31..40deecea1c 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -8,7 +8,7 @@ module Rails
attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets,
:cache_classes, :cache_store, :consider_all_requests_local,
:dependency_loading, :filter_parameters, :force_ssl, :helpers_paths,
- :initializers_paths, :logger, :log_tags, :preload_frameworks,
+ :logger, :log_tags, :preload_frameworks,
:railties_order, :relative_url_root, :reload_plugins, :secret_token,
:serve_static_assets, :ssl_options, :static_cache_control, :session_options,
:time_zone, :reload_classes_only_on_change, :whiny_nils
@@ -36,7 +36,6 @@ module Rails
@generators = app_generators
@cache_store = [ :file_store, "#{root}/tmp/cache/" ]
@railties_order = [:all]
- @initializers_paths = []
@relative_url_root = ENV["RAILS_RELATIVE_URL_ROOT"]
@reload_classes_only_on_change = true
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index e000f6ef3a..3a94311b57 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -4,10 +4,6 @@ module Rails
include Initializable
$rails_rake_task = nil
- initializer :load_config_initializers do
- config.initializers_paths.each { |init| load(init) }
- end
-
initializer :add_generator_templates do
config.generators.templates.unshift(*paths["lib/templates"].existent)
end