diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-03-07 20:58:11 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-03-07 20:58:11 +0530 |
| commit | 70ff31d69f017d1bc674b913865d5a008de0c8a6 (patch) | |
| tree | e4596f11dca55aeef789922713fa07eee109e742 /guides/source/4_1_release_notes.md | |
| parent | 507ee79a6ce2756266fbe82d63235fe7aef77594 (diff) | |
| parent | 3f1699a780de5cd0c3433bc3427cc43f08f77040 (diff) | |
| download | rails-70ff31d69f017d1bc674b913865d5a008de0c8a6.tar.gz rails-70ff31d69f017d1bc674b913865d5a008de0c8a6.tar.bz2 rails-70ff31d69f017d1bc674b913865d5a008de0c8a6.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/4_1_release_notes.md
Diffstat (limited to 'guides/source/4_1_release_notes.md')
| -rw-r--r-- | guides/source/4_1_release_notes.md | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/guides/source/4_1_release_notes.md b/guides/source/4_1_release_notes.md index a01031ca96..6abbb799c8 100644 --- a/guides/source/4_1_release_notes.md +++ b/guides/source/4_1_release_notes.md @@ -457,10 +457,10 @@ for detailed changes. ### Notable changes -* Default scopes are no longer overriden by chained conditions. +* Default scopes are no longer overridden by chained conditions. Before this change 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. [More Details](upgrading_ruby_on_rails.html#changes-on-default-scopes). * Added `ActiveRecord::Base.to_param` for convenient "pretty" URLs derived from @@ -547,13 +547,12 @@ for detailed changes. ([Pull Request](https://github.com/rails/rails/pull/13350)) * Make `change_column_null` - revertable. ([Commit](https://github.com/rails/rails/commit/724509a9d5322ff502aefa90dd282ba33a281a96)) + revertible. ([Commit](https://github.com/rails/rails/commit/724509a9d5322ff502aefa90dd282ba33a281a96)) * Added a flag to disable schema dump after migration. This is set to `false` by default in the production environment for new applications. ([Pull Request](https://github.com/rails/rails/pull/13948)) - Active Model ------------ |