Merge pull request #11912 from jonkessler/respond-to-signature-fixes

Update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument

2 files changed, 8 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
 
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index c51488e0e1..03a735b1c1 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -679,5 +679,12 @@ module ApplicationTests
       end
       assert_equal Logger::INFO, Rails.logger.level
     end
+
+    test "respond_to? accepts include_private" do
+      make_basic_app
+
+      assert_not Rails.configuration.respond_to?(:method_missing)
+      assert Rails.configuration.respond_to?(:method_missing, true)
+    end
   end
 end