diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-07-30 00:34:19 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:12 +0200 |
| commit | 6c7d895ddae5a7a696a9a047e025e9e4e305f790 (patch) | |
| tree | 2e8453c339d9c1f9cd06a96c2e57189af8d0a1ee /actionpack/lib | |
| parent | 9e6a1439d1a0ad7f7098f1eca0bb8f6fa9482c48 (diff) | |
| download | rails-6c7d895ddae5a7a696a9a047e025e9e4e305f790.tar.gz rails-6c7d895ddae5a7a696a9a047e025e9e4e305f790.tar.bz2 rails-6c7d895ddae5a7a696a9a047e025e9e4e305f790.zip | |
Do not load AV inside AP
Move that part to AV railtie
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 8 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index cc03da4904..d08e3c4e8e 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -50,14 +50,6 @@ module ActionController end end -# All of these simply register additional autoloads -require 'action_view' -require 'action_view/vendor/html-scanner' - -ActiveSupport.on_load(:action_view) do - ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor) -end - # Common Active Support usage in Action Controller require 'active_support/core_ext/class/attribute_accessors' require 'active_support/core_ext/load_error' diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 5379547c57..0833e65d23 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -1,7 +1,6 @@ require "rails" require "action_controller" require "action_dispatch/railtie" -require "action_view/railtie" require "abstract_controller/railties/routes_helpers" require "action_controller/railties/helpers" |