diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-11 12:40:22 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-11 12:40:22 +0000 |
| commit | 9b98362cda013f85406ae8b26922264d382794dd (patch) | |
| tree | 9842eeee02a1e2b571e0008b18c5a8b390256224 /activerecord/CHANGELOG | |
| parent | ea12819adf5d5fa1e8ae07789478e18db887cda1 (diff) | |
| parent | 69387ce0169b95d3a170cfb1c66a7570b1746e37 (diff) | |
| download | rails-9b98362cda013f85406ae8b26922264d382794dd.tar.gz rails-9b98362cda013f85406ae8b26922264d382794dd.tar.bz2 rails-9b98362cda013f85406ae8b26922264d382794dd.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/activerecord_validations_callbacks.html
railties/doc/guides/source/activerecord_validations_callbacks.txt
Diffstat (limited to 'activerecord/CHANGELOG')
| -rw-r--r-- | activerecord/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index cca70f1fb7..423a0bd0cc 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *2.3.0/3.0* +* I18n the word separator for error messages. Introduces the activerecord.errors.format.separator translation key. #1294 [Akira Matsuda] + * Add :having as a key to find and the relevant associations. [miloops] * Added default_scope to Base #1381 [Paweł Kondzior]. Example: |