aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix tests broken by mocha absence [#186 state:resolved]Tim Pope2008-05-131-9/+11
| | | | | | | Two ActiveRecord tests depended on mocha but were not marked as such. Place them in a use_mocha block so the test suite passes. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* make CGI::Cookie handle deleting a cookie properlyRich Cavanaugh2008-05-132-1/+2
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix remote_function to escape apostrophes inside the remote url passed to ↵Andre Arko2008-05-132-1/+6
| | | | | | Ajax.Update. [#180 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Use 'public' schema path when connecting to 'postgres' database. [#170 ↵Tarmo Tänav2008-05-131-2/+2
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* 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
| | | | | | | | | | | | | | | | The 'postgres' database is meant for use by utilities and third party applications. CONNECT permission to the 'template1' database is usually only available to superusers which is why 'postgres' should be preferred as users whith "CREATE DATABASE" permissions are not neccessarily superusers.
| * ScaffoldGenerator to create public/stylesheets if missing. [#165 state:resolved]Matthew Brindley2008-05-131-1/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * 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
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Don't double-escape cookie store data. Don't split cookie values with ↵Rich Cavanaugh2008-05-124-6/+26
| | | | | | | | | | | | newlines into an array. [#130 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * 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
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * 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
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#166 state:resolved]
| * | Ensure dbconsole respects erb in database.yml. [#157 state:resolved] [Andrew ↵Pratik Naik2008-05-111-1/+2
| |/ | | | | | | | | | | Bennett] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * When preloading group by reflection rather than by class [#125 state:resolved]Frederick Cheung2008-05-112-6/+12
| | | | | | | | | | | | | | | | This avoids extra queries when several subclasses inherit the association from their parent class, while still coping with subclasses redefining associations. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix blank conditions on AssociationCollection#find. [#104 state:resolved]Jonathan Viney2008-05-112-1/+9
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * 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
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Remove unused JSON methods. [#164 state:resolved]Cheah Chu Yeow2008-05-112-29/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Added protection against duplicate migration names (Aslak Hellesøy) [#112 ↵Aslak Hellesøy2008-05-115-0/+32
| | | | | | | | state:resolved]
| * Fix validates_uniqueness_of for SQL keywords [#23 state:resolved]Alex MacCaw2008-05-114-1/+15
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed that forgery protection can be used without session tracking (Peter ↵David Heinemeier Hansson2008-05-111-0/+2
| | | | | | | | Jones) [#139 state:resolved]
| * Bug: Earlier Check for Session in Forgery ProtectionPeter Jones2008-05-112-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The session is used by the form_authenticity_token method before it is tested to be valid. This patch moves a few lines around so that the session is validated first. Without this patch, if you try to use forgery protection with sessions turned off, you get this exception message: undefined method `session_id' for {}:Hash The patch includes a test that can be used to see this behavior before the request_forgery_protection.rb file is patched to fix it.
| * 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 ↵David Heinemeier Hansson2008-05-112-0/+27
| | | | | | | | subclass if the superclass turned it off (Peter Jones) [#136 state:resolved]
| * Added session(:on) to turn session management back on in a controller ↵David Heinemeier Hansson2008-05-111-0/+2
| | | | | | | | 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 ↵Andreas Neuhaus2008-05-112-6/+11
| | | | | | | | | | | | | | | | before action processing instead after Signed-off-by: Michael Koziarski <michael@koziarski.com> [#10 state:resolved]
* | fix merge conflict with actionpack changelogrick2008-05-1073-790/+1356
|\|
| * Make render shorthands work with namespaced controllersJacek Becela2008-05-104-48/+195
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Escape globbed parameters in routes correctly.Chris Roos2008-05-102-9/+12
| | | | | | | | | | | | :controller => 'glob', :action=> 'show', :additional => ['foo/bar', 'baz'] Should generate /glob/show/foo%2Fbar/baz not /glob/show/foo/bar/baz
| * Merge docrails:Pratik Naik2008-05-0934-570/+658
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e6afd8b2736364322b673bbdcca3e9b38b6d3da0 Author: Xavier Noria <fxn@hashref.com> Date: Thu May 8 23:49:36 2008 +0200 Overall documentation improvement and markup corrections. Zillion changes. commit 2fead68b3192332eee27945ed95a94a64ca73f70 Author: Austin Putman <austin@emmanuel.local> Date: Wed May 7 19:35:46 2008 -0700 Documented class methods on ActionController::Routing. These are dangerous, and mostly used for testing. commit f5b84182dbc39bea79c8ee319c688d00fa99f9d1 Author: Teflon Ted <github@rudiment.net> Date: Wed May 7 16:08:49 2008 -0400 Added explanation about errant inflections not being patched in the future in order to avoid breaking legacy applications. commit 370f4f51722cec49ace17093d29e9ce9e8f15cfb Author: Sunny Ripert <negatif@gmail.com> Date: Wed May 7 14:00:59 2008 +0200 Applied list conventions in AR::Base commit 5bd18429f09d44e75191bec42a6db04bd33f3030 Author: Sunny Ripert <negatif@gmail.com> Date: Wed May 7 13:53:35 2008 +0200 Renamed Options list to Attributes list whenever they weren't option hashes in AR::Base commit d912bd5672316454457ae83f6e9dda5197beeb6f Author: Yaroslav Markin <yaroslav@markin.net> Date: Wed May 7 13:50:28 2008 +0400 Add a filter_parameter_logging usage hint to generated ApplicationController. This may help to remind the developer to filter sensitive information from application logs. Closes #11578 commit b243de0db3c2605121e055079854af5090d06374 Author: Jack Danger Canty <git@6brand.com> Date: Tue May 6 23:39:47 2008 -0700 doc: disambiguating an example ActiveRecord class commit f81d771f0657ae8375b84a77a059812cce5d6fd9 Author: Jack Danger Canty <git@6brand.com> Date: Tue May 6 23:35:05 2008 -0700 doc: ActiveRecord::Reflection::AssociationReflection#through_reflection Added documentation demonstrating the use of #through_reflection for finding intervening reflection objects for HasManyThrough and HasOneThrough. commit ae6b46f00b5b8b2939c6b37ce3329c83de7e71db Author: Cheah Chu Yeow <chuyeow@gmail.com> Date: Wed May 7 13:47:41 2008 +0800 Document AttributeAssignmentError and MultiparameterAssignmentErrors. commit 8f463550b597db2156b67733f31aed13487fbc3a Author: John Barnette <jbarnette@gmail.com> Date: Tue May 6 22:46:44 2008 -0700 Killing/fixing a bunch of outdated language in the AR README. commit aca44bcd92ef783abdf484b58abdde6786db0f89 Author: Cheah Chu Yeow <chuyeow@gmail.com> Date: Wed May 7 13:34:52 2008 +0800 Make a note about ActiveResource::Timeouterror being raised when ARes calls timeout. commit 284a930a93fbee16e25d06392779dbf2f03e9e12 Author: Jonathan Dance <jd@wuputah.com> Date: Tue May 6 14:58:26 2008 -0400 improvements to the page caching docs commit 9482da621390c874da7c921c8bd6230caae7035a Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 18:13:40 2008 +0200 validates_numericality_of() "integer" option really is "only_integer" commit e9afd6790a8f530528f6597a7f59bb283be754f6 Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 12:11:59 2008 +0200 Harmonized hash notation in AR::Base commit 67ebf14a91ffd970b582be4ff2991d691a9cf3e1 Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 12:06:19 2008 +0200 Turned options into rdoc-lists in AR::Base commit 0ec7c0a41d889d4e5382b9dff72f1aaba89bf297 Author: Marshall Huss <mwhuss@Macbook.local> Date: Sun May 4 23:21:33 2008 -0400 Added information of how to set element_name in the case the user has a name confliction with an existing model Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * ActionView::InstanceTag#default_time_from_options with hash args uses ↵gbuesing2008-05-083-3/+29
| | | | | | | | 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 ↵gbuesing2008-05-086-1/+42
| | | | | | | | 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 ↵gbuesing2008-05-082-1/+3
| | | | | | | | 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 ↵gbuesing2008-05-083-1/+19
| | | | | | | | class; no longer relying on method_missing
| * 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
| | | | | | | | string. Eliminate creation of additional TimeWithZone instance to determine utc offset.
| * ActiveRecord time zone aware attributes: blank string is treated as nil when ↵gbuesing2008-05-082-3/+11
| | | | | | | | assigned to writer
| * Fix Time.zone.parse from stripping time zone information and make Time aware ↵Scott Fleckenstein2008-05-084-1/+39
| | | | | | | | attribute methods use Time.zone.parse instead of to_time
| * Calling ActiveRecord#inspect on an unloaded association won't wipe the ↵Andreas Neuhaus2008-05-083-2/+12
| | | | | | | | | | | | collection [#9 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Some dbconsole tweaks. [#102 state:resolved]Jeremy Kemper2008-05-071-20/+26
| |