Merge pull request #41251 from kamipo/fix_deprecation_message

Fix deprecation message s/Rails 6.1 will return/Rails 7.0 will return/
rails · Jan 27, 2021 · 3921f24 · 3921f24
2 parents c38db72 + 388f602
commit 3921f24
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -36,11 +36,11 @@ def content_mime_type
       def content_type
         if self.class.return_only_media_type_on_content_type
           ActiveSupport::Deprecation.warn(
-            "Rails 6.1 will return Content-Type header without modification." \
+            "Rails 7.0 will return Content-Type header without modification." \
             " If you want just the MIME type, please use `#media_type` instead."
           )
 
-          content_mime_type && content_mime_type.to_s
+          content_mime_type&.to_s
         else
           super
         end