Merge pull request #24318 from bogdanvlviv/patch-1

extension synonyms yml and yaml

actionpack/CHANGELOG.md

+*   Add extension synonyms `yml` and `yaml` for MIME type `application/x-yaml`.
+
+   *bogdanvlviv*
+
 *   Adds support for including ActionController::Cookies in API controllers.
     Previously, including the module would raise when trying to define
     a `cookies` helper method. Skip calling #helper_method if it is not

actionpack/lib/action_dispatch/http/mime_types.rb

@@ -21,7 +21,7 @@
 Mime::Type.register "application/xml", :xml, %w( text/xml application/x-xml )
 Mime::Type.register "application/rss+xml", :rss
 Mime::Type.register "application/atom+xml", :atom
-Mime::Type.register "application/x-yaml", :yaml, %w( text/yaml )
+Mime::Type.register "application/x-yaml", :yaml, %w( text/yaml ), %w(yml yaml)
 
 Mime::Type.register "multipart/form-data", :multipart_form
 Mime::Type.register "application/x-www-form-urlencoded", :url_encoded_form