diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-04-12 23:26:45 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-04-12 23:26:45 -0300 |
| commit | 0c21fb361cbce5cb6526d3e9a8298317fe971f3b (patch) | |
| tree | f5a0c63dc0c51a704b165a8db34ef2e8529e1c77 /actionpack | |
| parent | a1626004997b2eea0be6ab8cd079d892e8d85f13 (diff) | |
| parent | 3a37c4e371a51f26c33ca3183f8f09b9c94e3a00 (diff) | |
| download | rails-0c21fb361cbce5cb6526d3e9a8298317fe971f3b.tar.gz rails-0c21fb361cbce5cb6526d3e9a8298317fe971f3b.tar.bz2 rails-0c21fb361cbce5cb6526d3e9a8298317fe971f3b.zip | |
Merge pull request #24318 from bogdanvlviv/patch-1
extension synonyms yml and yaml
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_types.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index e0ac6c24b1..0ca3d2eb01 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,7 @@ +* 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 diff --git a/actionpack/lib/action_dispatch/http/mime_types.rb b/actionpack/lib/action_dispatch/http/mime_types.rb index 66cea88256..8b04174f1f 100644 --- a/actionpack/lib/action_dispatch/http/mime_types.rb +++ b/actionpack/lib/action_dispatch/http/mime_types.rb @@ -21,7 +21,7 @@ Mime::Type.register "video/mpeg", :mpeg, [], %w(mpg mpeg mpe) 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 |