diff options
| author | rick <rick@spacemonkey.local> | 2008-05-10 17:46:55 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-10 17:46:55 -0700 |
| commit | d09a8446d5606a5a0b5c024224b09a1318e9cf4d (patch) | |
| tree | 199ef3554f731c980ea5726e67e34af4ea057c2e /activerecord/CHANGELOG | |
| parent | c8451aeeea200043d8a3e6eae9c49def3a154ddb (diff) | |
| parent | a7ea06b4ebe252e258f83e7de945b4baa30ec3bc (diff) | |
| download | rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.tar.gz rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.tar.bz2 rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.zip | |
fix merge conflict with actionpack changelog
Diffstat (limited to 'activerecord/CHANGELOG')
| -rw-r--r-- | activerecord/CHANGELOG | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 04cf72b38c..597b876f22 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,9 @@ *SVN* +* Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true [Geoff Buesing] + +* Time zone aware attribute methods use Time.zone.parse instead of #to_time for String arguments, so that offset information in String is respected. Resolves #105. [Scott Fleckenstein, Geoff Buesing] + * Added change_table for migrations (Jeff Dean) [#71]. Example: change_table :videos do |t| |