aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/class_inheritable_attributes.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/class_inheritable_attributes.rb b/activesupport/lib/active_support/class_inheritable_attributes.rb
index f9ca7af7b2..2e70a64436 100644
--- a/activesupport/lib/active_support/class_inheritable_attributes.rb
+++ b/activesupport/lib/active_support/class_inheritable_attributes.rb
@@ -110,8 +110,6 @@ class Class # :nodoc:
child.instance_variable_set('@inheritable_attributes', inheritable_attributes.dup)
end
- if respond_to?(:inherited)
- alias_method :inherited_without_inheritable_attributes, :inherited
- end
- alias_method :inherited, :inherited_with_inheritable_attributes
+ alias inherited_without_inheritable_attributes inherited
+ alias inherited inherited_with_inheritable_attributes
end