git clone git://github.com/rails/rails.git
Remove AR::Base#attributes argument. [#52 state:resolved]
Updated copyright years
Making ready for RC1 release
No more svn version numbers to rely on, use timestamps instead
Depend on latest Rake
Merge branch 'master' of git@github.com:rails/rails
Ensure dbconsole respects erb in database.yml. [#157 state:resolved] [Andrew Bennett]
Added not to sanitize helper docs that it doesn't guarantee well-formed markup.
When preloading group by reflection rather than by class [#125 state:resolved]
Fix blank conditions on AssociationCollection#find. [#104 state:resolved]
Add test for named_scope#proxy_options. [#97 state:resolved]
Ensure hm:t preloading honours reflection options. [#137 state:resolved]
Remove unused JSON methods. [#164 state:resolved]
Added protection against duplicate migration names (Aslak Hellesøy) [#112 state:resolved]
Fix validates_uniqueness_of for SQL keywords [#23 state:resolved]
Fixed that forgery protection can be used without session tracking (Peter Jones) [#139 state:resolved]
Bug: Earlier Check for Session in Forgery Protection
Fix generate_app_doc task (Jaroslaw) [#70 state:resolved]
Added session(:on) to turn session management back on in a controller subclass if the superclass turned it off (Peter Jones) [#136 state:resolved]
Fixed flash.now not being accessible in tests. Flash sweeping is now done before action processing instead after
Make render shorthands work with namespaced controllers
Escape globbed parameters in routes correctly.
Merge docrails:
ActionView::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
Adding Date.current, which returns Time.zone.today if config.time_zone is set; otherwise returns Date.today. ActionView date_helper uses Date.current to determine locale-appropriate default
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
TimeWithZone: date part getter methods (#year #mon #day etc) are defined on class; no longer relying on method_missing
Updating changelogs
Time.zone.parse: return nil for strings with no date information
