aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-29 16:28:54 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-29 16:28:54 -0500
commitc7c35be8fe30b3e29a5d05edae767f7d6a286911 (patch)
treec1f7aece2c62f276bebb4d9cf6365b5ae4bcb9a6 /actionpack/lib/action_controller/base
parent69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3 (diff)
downloadrails-c7c35be8fe30b3e29a5d05edae767f7d6a286911.tar.gz
rails-c7c35be8fe30b3e29a5d05edae767f7d6a286911.tar.bz2
rails-c7c35be8fe30b3e29a5d05edae767f7d6a286911.zip
AS::Concern includes InstanceMethods module if it exists
Diffstat (limited to 'actionpack/lib/action_controller/base')
-rw-r--r--actionpack/lib/action_controller/base/chained/filters.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/base/chained/filters.rb b/actionpack/lib/action_controller/base/chained/filters.rb
index e121c0129d..f528dd0686 100644
--- a/actionpack/lib/action_controller/base/chained/filters.rb
+++ b/actionpack/lib/action_controller/base/chained/filters.rb
@@ -1,11 +1,6 @@
module ActionController #:nodoc:
module Filters #:nodoc:
- def self.included(base)
- base.class_eval do
- extend ClassMethods
- include ActionController::Filters::InstanceMethods
- end
- end
+ extend ActiveSupport::Concern
class FilterChain < ActiveSupport::Callbacks::CallbackChain #:nodoc:
def append_filter_to_chain(filters, filter_type, &block)