diff options
author | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-11-09 10:57:20 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-11-09 10:57:20 -0800 |
commit | 790c062280c0d23c2033e4983c13d402c0424f2a (patch) | |
tree | 7b652b420411779072c2371a42e84c83525f63b1 /activesupport/lib/active_support/dependencies.rb | |
parent | 51fe6d05e73a4e0f8481f4e441f4ca886d65a69c (diff) | |
parent | 303991288633effea5a1d1774dbd861951303fe5 (diff) | |
download | rails-790c062280c0d23c2033e4983c13d402c0424f2a.tar.gz rails-790c062280c0d23c2033e4983c13d402c0424f2a.tar.bz2 rails-790c062280c0d23c2033e4983c13d402c0424f2a.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
-rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 7f6f012721..e858bcdc80 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -339,7 +339,7 @@ module ActiveSupport #:nodoc: next end [ nesting_camel ] - end.flatten.compact.uniq + end.compact.flatten.compact.uniq end # Search for a file in load_paths matching the provided suffix. |