aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorVishnu Atrai <vishnu.atrai@gmail.com>2011-06-29 19:08:09 +0530
committerVishnu Atrai <vishnu.atrai@gmail.com>2011-07-11 13:14:02 +0530
commit525fd3ac86fd192c22e89d917047b66c570004dc (patch)
treec9d1b83c6cf8f1dd4c8ce618be7f39d0c08bbf44 /actionpack/lib/action_controller
parentad912c08a91b90f6a7b30ae75b4a3a5f6c513bd4 (diff)
downloadrails-525fd3ac86fd192c22e89d917047b66c570004dc.tar.gz
rails-525fd3ac86fd192c22e89d917047b66c570004dc.tar.bz2
rails-525fd3ac86fd192c22e89d917047b66c570004dc.zip
TODO fix explicitly loading exceptations, autoload removed
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/data_streaming.rb1
-rw-r--r--actionpack/lib/action_controller/metal/request_forgery_protection.rb1
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: