aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-09-14 01:00:23 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-09-14 01:00:23 -0700
commit40937fe5192853b0234a4c8b04e91a402e957710 (patch)
tree06242d820f7bb4999ae0f6178d140036ee0550a3 /actionpack
parente1af54d35276b044f96f792b22e63d86e1199e86 (diff)
parent5138a303e423312a8f68b1dc14cca0758dcff59e (diff)
downloadrails-40937fe5192853b0234a4c8b04e91a402e957710.tar.gz
rails-40937fe5192853b0234a4c8b04e91a402e957710.tar.bz2
rails-40937fe5192853b0234a4c8b04e91a402e957710.zip
Merge pull request #7634 from arunagw/build_fix_actionmailer
Build fix for ActionMailer
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/request_forgery_protection.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 81188ac8cc..17d4a793ac 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -1,3 +1,4 @@
+require 'rack/session/abstract/id'
require 'action_controller/metal/exceptions'
module ActionController #:nodoc: