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 /actionpack/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 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 87f570d55c..852e783f40 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,6 +1,9 @@ *SVN* * Change the request forgery protection to go by Content-Type instead of request.format so that you can't bypass it by POSTing to "#{request.uri}.xml" [rick] +* InstanceTag#default_time_from_options with hash args uses Time.current as default; respects hash settings when time falls in system local spring DST gap [Geoff Buesing] + +* select_date defaults to Time.zone.today when config.time_zone is set [Geoff Buesing] * Fixed that TextHelper#text_field would corrypt when raw HTML was used as the value (mchenryc, Kevin Glowacz) [#80] |