aboutsummaryrefslogtreecommitdiffstats
path: root/guides/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'guides/CHANGELOG.md')
-rw-r--r--guides/CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index a7c215c295..14ad4fd424 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -1 +1,9 @@
+* Updates the maintenance policy to match the latest versions of Rails
+
+ *Matias Korhonen*
+
+* Switched the order of `Applying a default scope` and `Merging of scopes` subsections so default scopes are introduced first.
+
+ *Alex Riabov*
+
Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/guides/CHANGELOG.md) for previous changes.