diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
| commit | 435b088f5aa5d6bc38369dd9c9d067e21e5b7de1 (patch) | |
| tree | 3f64164d58791c4762c5fc5d4ca5240e0aecfebf /activesupport | |
| parent | 6ff506ffbc438a92cb6d3cb4351a0a463d57424a (diff) | |
| parent | fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69 (diff) | |
| download | rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.gz rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.bz2 rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.zip | |
Merge branch 'master' of git@github.com:rails/rails
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 |