diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-16 11:43:13 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-16 11:43:13 -0700 |
| commit | 2549f6d8ee104d1f83f573f5057c5f5e7c699608 (patch) | |
| tree | fe7955cb4cf106458e6ce45c15b18c65bf4246bb /activerecord/CHANGELOG.md | |
| parent | 23f35b2fd87b586278b167bb3f614df00811b104 (diff) | |
| parent | f2ca5aa5c2e9fed43ab11937906d98bd436ab820 (diff) | |
| download | rails-2549f6d8ee104d1f83f573f5057c5f5e7c699608.tar.gz rails-2549f6d8ee104d1f83f573f5057c5f5e7c699608.tar.bz2 rails-2549f6d8ee104d1f83f573f5057c5f5e7c699608.zip | |
Merge branch 'master' into joindep
* master:
Rephrase ActiveRecord transaction rollback warning
Fix code blocks identation on AR and AS CHANGELOGs
Removing unused fake models from actionpack tests
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 6e93477c3b..2d19e44abc 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -342,13 +342,13 @@ * Reset @column_defaults when assigning `locking_column`. We had a potential problem. For example: - class Post < ActiveRecord::Base - self.column_defaults # if we call this unintentionally before setting locking_column ... - self.locking_column = 'my_locking_column' - end + class Post < ActiveRecord::Base + self.column_defaults # if we call this unintentionally before setting locking_column ... + self.locking_column = 'my_locking_column' + end - Post.column_defaults["my_locking_column"] - => nil # expected value is 0 ! + Post.column_defaults["my_locking_column"] + => nil # expected value is 0 ! *kennyj* |