diff options
| author | José Valim <jose.valim@gmail.com> | 2011-07-11 07:35:43 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-07-11 07:35:43 -0700 |
| commit | 1fdbd4708fe4c8397961de9a5b9c1bf62a942635 (patch) | |
| tree | 3b0e7ac4b3f33a282ce61be11fe1a5793d104fef /actionpack/lib/action_controller | |
| parent | 3da3df8fcbe59d6433d1bf6632f73a0161bf48fe (diff) | |
| parent | 525fd3ac86fd192c22e89d917047b66c570004dc (diff) | |
| download | rails-1fdbd4708fe4c8397961de9a5b9c1bf62a942635.tar.gz rails-1fdbd4708fe4c8397961de9a5b9c1bf62a942635.tar.bz2 rails-1fdbd4708fe4c8397961de9a5b9c1bf62a942635.zip | |
Merge pull request #2009 from vatrai/autoload-todo-new
TODO fix explicitly loading exceptations, autoload removed
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 50827d8107..0785fe9679 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/file/path' +require 'action_controller/metal/exceptions' module ActionController #:nodoc: # Methods for sending arbitrary data and for streaming files to the browser, diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index 2271470334..258a40aea6 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/class/attribute' +require 'action_controller/metal/exceptions' module ActionController #:nodoc: class InvalidAuthenticityToken < ActionControllerError #:nodoc: |