diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-17 19:16:31 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-17 19:27:35 +0100 |
| commit | fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69 (patch) | |
| tree | dcf89fab841f873dd9c26b3f061f7d1c4e378f86 /activesupport | |
| parent | 4b33fae1f52325d22083de2e83d827b924d1c616 (diff) | |
| download | rails-fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69.tar.gz rails-fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69.tar.bz2 rails-fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69.zip | |
BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [DHH]
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index fe568d6127..5dbe466b7b 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -314,11 +314,7 @@ module ActiveSupport #:nodoc: nesting = nesting[1..-1] if nesting && nesting[0] == ?/ next if nesting.blank? - [ - nesting.camelize, - # Special case: application.rb might define ApplicationControlller. - ('ApplicationController' if nesting == 'application') - ] + [ nesting.camelize ] end.flatten.compact.uniq end |