aboutsummaryrefslogtreecommitdiffstats
path: root/guides/CHANGELOG.md
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-04-03 10:31:29 +0200
committerYves Senn <yves.senn@gmail.com>2014-04-03 10:31:29 +0200
commitc0e0e80fccf350ae5b59c9b17ec45577ff60f3cb (patch)
tree4d183cf634e15b4c65189330fa87e79e73ad82f3 /guides/CHANGELOG.md
parent79f06a91345a301e1a2f2378552b5860a493b256 (diff)
parent34a3d425ea78786c63757028257b63b895e60960 (diff)
downloadrails-c0e0e80fccf350ae5b59c9b17ec45577ff60f3cb.tar.gz
rails-c0e0e80fccf350ae5b59c9b17ec45577ff60f3cb.tar.bz2
rails-c0e0e80fccf350ae5b59c9b17ec45577ff60f3cb.zip
Merge pull request #14576 from ariabov/scope_sections_reordering
Change order of scope subsections in Active Record Querying guide [ci skip]
Diffstat (limited to 'guides/CHANGELOG.md')
-rw-r--r--guides/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index a7c215c295..246e1d3b96 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -1 +1,5 @@
+* 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.