diff options
| author | Anton Cherepanov <davetoxa@gmail.com> | 2014-06-23 22:50:21 +0600 |
|---|---|---|
| committer | Anton Cherepanov <davetoxa@gmail.com> | 2014-06-23 23:15:58 +0600 |
| commit | e2960fb293840983ac99a8997b09b183b86b05c7 (patch) | |
| tree | 02d1b8c5baa5a74b859c5f1a0dda662cb41db2f9 /guides/source/upgrading_ruby_on_rails.md | |
| parent | 936fd4c1e017ec88699b3cd7daa09847da36c731 (diff) | |
| download | rails-e2960fb293840983ac99a8997b09b183b86b05c7.tar.gz rails-e2960fb293840983ac99a8997b09b183b86b05c7.tar.bz2 rails-e2960fb293840983ac99a8997b09b183b86b05c7.zip | |
Small typo
Diffstat (limited to 'guides/source/upgrading_ruby_on_rails.md')
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index d7dbfccb76..1876959e03 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -315,10 +315,10 @@ authors.compact! ### Changes on Default Scopes -Default scopes are no longer overriden by chained conditions. +Default scopes are no longer overridden by chained conditions. In previous versions when you defined a `default_scope` in a model -it was overriden by chained conditions in the same field. Now it +it was overridden by chained conditions in the same field. Now it is merged like any other scope. Before: |