diff options
| author | Abdelkader Boudih <terminale@gmail.com> | 2014-09-17 23:14:43 +0100 |
|---|---|---|
| committer | Abdelkader Boudih <terminale@gmail.com> | 2014-09-17 23:14:43 +0100 |
| commit | 44033d8f428079d824d9b306af94f7ab0eb9952a (patch) | |
| tree | a98b48811d3a21930f8bb2565c9fa92b58a1cb87 | |
| parent | ddf0c0a1973cae55437525990dbb3c9b6069b553 (diff) | |
| parent | 8841f45129e586f580e0f3e5105de72b5eb575fe (diff) | |
| download | rails-44033d8f428079d824d9b306af94f7ab0eb9952a.tar.gz rails-44033d8f428079d824d9b306af94f7ab0eb9952a.tar.bz2 rails-44033d8f428079d824d9b306af94f7ab0eb9952a.zip | |
Merge pull request #16953 from akshay-vishnoi/docs-rails-4point2
[ci skip] ActionView and ActionMailerCHANGELOG docs fixes
| -rw-r--r-- | actionmailer/CHANGELOG.md | 8 | ||||
| -rw-r--r-- | actionview/CHANGELOG.md | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 1ff4db41a3..e5e3a0164d 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,13 +1,13 @@ -* Added #deliver_later, #deliver_now and deprecate #deliver in favour of - #deliver_now. #deliver_later will enqueue a job to render and deliver +* Added `#deliver_later`, `#deliver_now` and deprecate `#deliver` in favour of + `#deliver_now`. `#deliver_later` will enqueue a job to render and deliver the mail instead of delivering it right at that moment. The job is enqueued using the new Active Job framework in Rails, and will use whatever queue is configured for Rails. *DHH/Abdelkader Boudih/Cristian Bica* -* Make ActionMailer::Previews methods class methods. Previously they were - instance methods and ActionMailer tries to render a message when they +* Make `ActionMailer::Previews` methods class methods. Previously they were + instance methods and `ActionMailer` tries to render a message when they are called. *Cristian Bica* diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 5e0b134ba4..ed58933472 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -127,12 +127,12 @@ Before: - #=> favicon_link_tag 'myicon.ico' + # => favicon_link_tag 'myicon.ico' <link href="/assets/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> After: - #=> favicon_link_tag 'myicon.ico' + # => favicon_link_tag 'myicon.ico' <link href="/assets/myicon.ico" rel="shortcut icon" type="image/x-icon" /> *Geoffroy Lorieux* @@ -145,7 +145,7 @@ *Joost Baaij* -* `collection_check_boxes` respects `:index` option for the hidden filed name. +* `collection_check_boxes` respects `:index` option for the hidden field name. Fixes #14147. @@ -166,7 +166,7 @@ *Vasiliy Ermolovich* -* Fixed a problem where the default options for the `button_tag` helper is not +* Fixed a problem where the default options for the `button_tag` helper are not applied correctly. Fixes #14254. |