diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-03 22:27:28 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-03 22:27:28 -0800 |
| commit | 5e94d3e3ea06e577d97a32eb4b38b61c4ce8ff8f (patch) | |
| tree | b89d06302223be67c595e65bffce54357d41a15a /railties/lib/rails/application.rb | |
| parent | d7d917335e242f48fae31bc99e6d4ab381244913 (diff) | |
| parent | eca11bfdb5d3cf375faf8a24e2dc0cc5abd20f92 (diff) | |
| download | rails-5e94d3e3ea06e577d97a32eb4b38b61c4ce8ff8f.tar.gz rails-5e94d3e3ea06e577d97a32eb4b38b61c4ce8ff8f.tar.bz2 rails-5e94d3e3ea06e577d97a32eb4b38b61c4ce8ff8f.zip | |
Merge
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 5e68c05d7c..3fb4b723ab 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -8,7 +8,7 @@ module Rails class << self attr_writer :config alias configure class_eval - delegate :initialize!, :load_tasks, :to => :instance + delegate :initialize!, :load_tasks, :root, :to => :instance private :new def instance @@ -267,18 +267,5 @@ module Rails ActiveSupport::Dependencies.unhook! end end - - # For each framework, search for instrument file with Notifications hooks. - # - initializer :load_notifications_hooks do - frameworks = [ :active_record, :action_controller, :action_view, - :action_mailer, :active_resource ] - frameworks.each do |framework| - begin - require "#{framework}/notifications" - rescue LoadError => e - end - end - end end end |