diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-02-15 22:06:17 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-02-15 22:06:17 +0530 |
| commit | 0c145448c42e811f9241e1634ecd2d60ddefff3a (patch) | |
| tree | fb56c9870510de868250c4e027a11ebcead6e53f /activesupport/lib/active_support | |
| parent | 520a16caad3d89da734c0f5bc14b8c16090f891f (diff) | |
| parent | 2008fe606b6096e4b8ad9c03e03b0d11b94605cd (diff) | |
| download | rails-0c145448c42e811f9241e1634ecd2d60ddefff3a.tar.gz rails-0c145448c42e811f9241e1634ecd2d60ddefff3a.tar.bz2 rails-0c145448c42e811f9241e1634ecd2d60ddefff3a.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/upgrading_ruby_on_rails.md
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/subclasses.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/subclasses.rb b/activesupport/lib/active_support/core_ext/class/subclasses.rb index 9a2dc6e7c5..3c4bfc5f1e 100644 --- a/activesupport/lib/active_support/core_ext/class/subclasses.rb +++ b/activesupport/lib/active_support/core_ext/class/subclasses.rb @@ -29,9 +29,9 @@ class Class # # class Foo; end # class Bar < Foo; end - # class Baz < Foo; end + # class Baz < Bar; end # - # Foo.subclasses # => [Baz, Bar] + # Foo.subclasses # => [Bar] def subclasses subclasses, chain = [], descendants chain.each do |k| |