Merge remote branch 'spastorino/master'

Signed-off-by: José Valim <jose.valim@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/descendants_tracker.rb b/activesupport/lib/active_support/descendants_tracker.rb
index 6cba84d79e..4d1cfacc95 100644
--- a/activesupport/lib/active_support/descendants_tracker.rb
+++ b/activesupport/lib/active_support/descendants_tracker.rb
@@ -11,9 +11,9 @@ module ActiveSupport
     end
 
     def self.descendants(klass)
-      @@direct_descendants[klass].inject([]) do |descendants, klass|
-        descendants << klass
-        descendants.concat klass.descendants
+      @@direct_descendants[klass].inject([]) do |descendants, _klass|
+        descendants << _klass
+        descendants.concat _klass.descendants
       end
     end
 
@@ -40,4 +40,4 @@ module ActiveSupport
       DescendantsTracker.descendants(self)
     end
   end
-end
\ No newline at end of file
+end