aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Fixed generator collisions for nested controller modules.Amol Hatwar2008-05-131-9/+16
* Add some test coverage for RailsControllerGenerator.Joshua Peek2008-05-132-10/+44
* Fix tests broken by mocha absence [#186 state:resolved]Tim Pope2008-05-131-9/+11
* make CGI::Cookie handle deleting a cookie properlyRich Cavanaugh2008-05-132-1/+2
* Fix remote_function to escape apostrophes inside the remote url passed to Aja...Andre Arko2008-05-132-1/+6
* Use 'public' schema path when connecting to 'postgres' database. [#170 state:...Tarmo Tänav2008-05-131-2/+2
* Include time zone offset in TimeWithZone#to_jsonDaniel Morrison2008-05-132-2/+2
* Merge branch 'master' of git@github.com:rails/railsrick2008-05-1372-140/+292
|\
| * Use 'postgres' database instead of 'template1'Tarmo Tänav2008-05-131-2/+2
| * ScaffoldGenerator to create public/stylesheets if missing. [#165 state:resolved]Matthew Brindley2008-05-131-1/+2
| * Remove unnecessary DeprecatedInstanceVariable classPratik Naik2008-05-132-27/+0
| * Dirty attributes aren't cleared if save fails. [#174 state:resolved]Xavier Noria2008-05-123-9/+30
| * Don't double-escape cookie store data. Don't split cookie values with newline...Rich Cavanaugh2008-05-124-6/+26
| * Simpler rescue_action conditionJeremy Kemper2008-05-121-4/+2
| * Use #duplicable? instead of anonymous rescueJeremy Kemper2008-05-121-1/+1
| * Ruby 1.9 compat: define __setobj__ for DelegatorJeremy Kemper2008-05-121-2/+6
| * Remove AR::Base#attributes argument. [#52 state:resolved]Frederick Cheung2008-05-121-1/+1
| * Updated copyright yearsDavid Heinemeier Hansson2008-05-1117-17/+17
| * Making ready for RC1 releaseDavid Heinemeier Hansson2008-05-1117-21/+21
| * No more svn version numbers to rely on, use timestamps insteadDavid Heinemeier Hansson2008-05-111-1/+1
| * Depend on latest RakeDavid Heinemeier Hansson2008-05-111-1/+1
| * Merge branch 'master' of git@github.com:rails/railsPratik Naik2008-05-111-0/+5
| |\
| | * Added not to sanitize helper docs that it doesn't guarantee well-formed markup.Michael Schuerig2008-05-121-0/+5
| * | Ensure dbconsole respects erb in database.yml. [#157 state:resolved] [Andrew ...Pratik Naik2008-05-111-1/+2
| |/
| * When preloading group by reflection rather than by class [#125 state:resolved]Frederick Cheung2008-05-112-6/+12
| * Fix blank conditions on AssociationCollection#find. [#104 state:resolved]Jonathan Viney2008-05-112-1/+9
| * Add test for named_scope#proxy_options. [#97 state:resolved]Duncan Beevers2008-05-112-0/+18
| * Ensure hm:t preloading honours reflection options. [#137 state:resolved]Frederick Cheung2008-05-114-5/+23
| * Remove unused JSON methods. [#164 state:resolved]Cheah Chu Yeow2008-05-112-29/+2
| * Added protection against duplicate migration names (Aslak Hellesøy) [#112 st...Aslak Hellesøy2008-05-115-0/+32
| * Fix validates_uniqueness_of for SQL keywords [#23 state:resolved]Alex MacCaw2008-05-114-1/+15
| * Fixed that forgery protection can be used without session tracking (Peter Jon...David Heinemeier Hansson2008-05-111-0/+2
| * Bug: Earlier Check for Session in Forgery ProtectionPeter Jones2008-05-112-3/+27
| * Fix generate_app_doc task (Jaroslaw) [#70 state:resolved]David Heinemeier Hansson2008-05-111-1/+1
| * Added session(:on) to turn session management back on in a controller subclas...David Heinemeier Hansson2008-05-112-0/+27
| * Added session(:on) to turn session management back on in a controller subclas...David Heinemeier Hansson2008-05-111-0/+2
| * Fixed flash.now not being accessible in tests. Flash sweeping is now done bef...Andreas Neuhaus2008-05-112-6/+11
* | fix merge conflict with actionpack changelogrick2008-05-1073-790/+1356
|\|
| * Make render shorthands work with namespaced controllersJacek Becela2008-05-104-48/+195
| * Escape globbed parameters in routes correctly.Chris Roos2008-05-102-9/+12
| * Merge docrails:Pratik Naik2008-05-0934-570/+658
| * ActionView::InstanceTag#default_time_from_options with hash args uses Time.cu...gbuesing2008-05-083-3/+29
| * Adding Date.current, which returns Time.zone.today if config.time_zone is set...gbuesing2008-05-086-1/+42
| * Base#instantiate_time_object: eliminate check for Time.zone, since we can ass...gbuesing2008-05-082-1/+3
| * TimeWithZone: date part getter methods (#year #mon #day etc) are defined on c...gbuesing2008-05-083-1/+19
| * Updating changelogsgbuesing2008-05-082-0/+6
| * Time.zone.parse: return nil for strings with no date informationgbuesing2008-05-083-2/+12
| * Time.zone.parse: compatibility with far future date with time zone offset in ...gbuesing2008-05-082-3/+13
| * ActiveRecord time zone aware attributes: blank string is treated as nil when ...gbuesing2008-05-082-3/+11
| * Fix Time.zone.parse from stripping time zone information and make Time aware ...Scott Fleckenstein2008-05-084-1/+39