Merge pull request rails#22482 from ridiculous/master

Replace ActionMailer::Base.respond_to? with respond_to_missing?

actionmailer/lib/action_mailer/base.rb

@@ -541,10 +541,6 @@ def deliver_mail(mail) #:nodoc:
         end
       end
 
-      def respond_to?(method, include_private = false) #:nodoc:
-        super || action_methods.include?(method.to_s)
-      end
-
     protected
 
       def set_payload_for_mail(payload, mail) #:nodoc:
@@ -566,6 +562,12 @@ def method_missing(method_name, *args) # :nodoc:
           super
         end
       end
+
+    private
+
+      def respond_to_missing?(method, include_all = false) #:nodoc:
+        action_methods.include?(method.to_s)
+      end
     end
 
     attr_internal :message