diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-12-05 07:25:17 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-12-05 07:25:17 -0800 |
| commit | 5086c8c2113b67eb893cb34882e06c8b83e7951c (patch) | |
| tree | 1b84176e7e3fcfc2487a3310f49a87e2cd903ee5 /railties | |
| parent | 23d555a0abcbe5bb143928d33aaf66b38f63338b (diff) | |
| parent | d6eda3ef3c59e377670442cd7f36460dbdf389f5 (diff) | |
| download | rails-5086c8c2113b67eb893cb34882e06c8b83e7951c.tar.gz rails-5086c8c2113b67eb893cb34882e06c8b83e7951c.tar.bz2 rails-5086c8c2113b67eb893cb34882e06c8b83e7951c.zip | |
Merge pull request #13189 from strzalek/retain-ap-av-dep
Retain ActionPack dependency on ActionView. Fixes #12979.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/rails_info_controller_test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index e45a5228a1..a9b237d0a5 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -1,7 +1,5 @@ require 'abstract_unit' -ActionController::Base.superclass.send(:include, ActionView::Layouts) - module ActionController class Base include ActionController::Testing |