aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-05-03 16:57:54 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2016-05-03 16:57:54 +0200
commitac8d0d76cb72bd0542405cfb73552a699f2bc0ef (patch)
tree1bcd4bd2e480dcd844f831d62070ff2a53277bc7 /guides/source
parent5fd17b92577a82ca3808bac199fa051c5ee9f7a9 (diff)
parent94ffebab62bb53ff0a5b903ec597d30539cfe047 (diff)
downloadrails-ac8d0d76cb72bd0542405cfb73552a699f2bc0ef.tar.gz
rails-ac8d0d76cb72bd0542405cfb73552a699f2bc0ef.tar.bz2
rails-ac8d0d76cb72bd0542405cfb73552a699f2bc0ef.zip
Merge pull request #24832 from prathamesh-sonpatki/fix-release-notes
Release notes: Remove duplicate entries
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/5_0_release_notes.md13
1 files changed, 3 insertions, 10 deletions
diff --git a/guides/source/5_0_release_notes.md b/guides/source/5_0_release_notes.md
index 17a738cf31..8d8aeff63f 100644
--- a/guides/source/5_0_release_notes.md
+++ b/guides/source/5_0_release_notes.md
@@ -328,7 +328,7 @@ Please refer to the [Changelog][action-view] for detailed changes.
* Changed the default template handler from `ERB` to `Raw`.
([commit](https://github.com/rails/rails/commit/4be859f0fdf7b3059a28d03c279f03f5938efc80))
-* Collection rendering can cache and fetches multiple partials.
+* Collection rendering can cache and fetches multiple partials at once.
([Pull Request](https://github.com/rails/rails/pull/18948),
[commit](https://github.com/rails/rails/commit/e93f0f0f133717f9b06b1eaefd3442bd0ff43985))
@@ -339,10 +339,6 @@ Please refer to the [Changelog][action-view] for detailed changes.
button on submit to prevent double submits.
([Pull Request](https://github.com/rails/rails/pull/21135))
-* Collection rendering can cache and fetch multiple partials at once.
- ([Pull Request](https://github.com/rails/rails/pull/21135))
-
-
Action Mailer
-------------
@@ -508,10 +504,6 @@ Please refer to the [Changelog][active-record] for detailed changes.
* Added `#cache_key` to `ActiveRecord::Relation`.
([Pull Request](https://github.com/rails/rails/pull/20884))
-* Require `belongs_to` by default.
- ([Pull Request](https://github.com/rails/rails/pull/18937)) - Deprecate
- `required` option in favor of `optional` for `belongs_to`
-
* Changed the default `null` value for `timestamps` to `false`.
([commit](https://github.com/rails/rails/commit/a939506f297b667291480f26fa32a373a18ae06a))
@@ -540,7 +532,8 @@ Please refer to the [Changelog][active-record] for detailed changes.
* `belongs_to` will now trigger a validation error by default if the
association is not present. You can turn this off on a per-association basis
- with `optional: true`.
+ with `optional: true`. Also deprecate `required` option in favor of `optional`
+ for `belongs_to`.
([Pull Request](https://github.com/rails/rails/pull/18937))
* Added `config.active_record.dump_schemas` to configure the behavior of