aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/dependencies.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/dependencies.rb b/actionpack/lib/action_controller/dependencies.rb
index 2960330afa..5132bccd62 100644
--- a/actionpack/lib/action_controller/dependencies.rb
+++ b/actionpack/lib/action_controller/dependencies.rb
@@ -2,7 +2,6 @@ module ActionController #:nodoc:
module Dependencies #:nodoc:
def self.append_features(base)
super
- base.class_eval { class << self; alias_method :inherited_without_model, :inherited; end }
base.extend(ClassMethods)
end
@@ -79,10 +78,6 @@ module ActionController #:nodoc:
end
end
end
-
- def inherited(child)
- inherited_without_model(child)
- end
end
end
end