aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorJon Kessler <jwkpiano1@gmail.com>2013-08-16 08:22:08 -0700
committerJon Kessler <jwkpiano1@gmail.com>2013-08-16 08:22:08 -0700
commitba5fab4c015366e355ab92371b27e77e896124a4 (patch)
treee5c5ec22f53168417734e3e715faa2e12f6fbb61 /railties/lib/rails
parent5c6e11d6b89444eefcb12e24d5419dadefdea1ba (diff)
downloadrails-ba5fab4c015366e355ab92371b27e77e896124a4.tar.gz
rails-ba5fab4c015366e355ab92371b27e77e896124a4.tar.bz2
rails-ba5fab4c015366e355ab92371b27e77e896124a4.zip
update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/railtie/configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index 0cbbf04da2..eb3b2d8ef4 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -80,7 +80,7 @@ module Rails
to_prepare_blocks << blk if blk
end
- def respond_to?(name)
+ def respond_to?(name, include_private = false)
super || @@options.key?(name.to_sym)
end