aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract/callbacks.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-07-20 16:57:23 -0300
committerEmilio Tagua <miloops@gmail.com>2009-07-20 16:57:23 -0300
commit9a28bd787660b08aae36155066e61d3608d0b4dd (patch)
tree2d10dd32ad28cc070c3d142c45d6a35fcd5ae43e /actionpack/lib/action_controller/abstract/callbacks.rb
parentb326faef0936e5a845d1f6eb9ed2200babfd05f8 (diff)
parent37658f15bb88e054635a496327a4a82bb50fd5d5 (diff)
downloadrails-9a28bd787660b08aae36155066e61d3608d0b4dd.tar.gz
rails-9a28bd787660b08aae36155066e61d3608d0b4dd.tar.bz2
rails-9a28bd787660b08aae36155066e61d3608d0b4dd.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/abstract/callbacks.rb')
-rw-r--r--actionpack/lib/action_controller/abstract/callbacks.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index 0d5161c80e..ea4b59466e 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -1,3 +1,5 @@
+require "active_support/new_callbacks"
+
module AbstractController
module Callbacks
extend ActiveSupport::Concern