aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-08-1449-603/+506
|\
| * Break up concerns for choosing what attributes should be serialized and the a...Joshua Peek2009-08-138-163/+136
| * Use safe tmp dirJoshua Peek2009-08-132-0/+2
| * Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-08-1342-546/+555
| |\
| | * make mysql and postgresql rebuild databases on every CI build, to prevent bre...Chad Woolley2009-08-121-2/+2
| | * Remove submoduleYehuda Katz2009-08-112-3/+0
| | * Made benchmarks submodule so it's easier to keep in syncYehuda Katz2009-08-1112-219/+3
| | * Allow superclass_delegating_accessor to take a block for initial set.Yehuda Katz2009-08-111-3/+4
| | * More perf work:Yehuda Katz2009-08-1111-100/+128
| | * Got overhead down from 127 to 85. All tests pass:Yehuda Katz2009-08-115-42/+65
| | * Tentatively accept the ":as or :object, but not both" solutionYehuda Katz2009-08-112-23/+22
| | * Make large_collection 1,000 partialsYehuda Katz2009-08-111-10/+10
| | * Further experimentation. Was able to cut the cost of rendering 100 partials i...Yehuda Katz2009-08-114-20/+65
| | * Add a few more benchesYehuda Katz2009-08-111-0/+12
| | * Add some more caching to the lookupYehuda Katz2009-08-113-18/+38
| | * This change causes some failing tests, but it should be possible to make them...Yehuda Katz2009-08-113-15/+20
| * | Ensure collections are not treated as nested resources.José Valim2009-08-134-18/+36
| * | Use less strict rules in generators lookup, so people can lay their generator...José Valim2009-08-107-68/+64
* | | Use ARel's joins when building a query for finding records with includedEmilio Tagua2009-08-145-79/+93
* | | Merge commit 'rails/master'Emilio Tagua2009-08-111-0/+18
|\ \ \ | | |/ | |/|
| * | Add tests for hm:t#push failuresPratik Naik2009-08-111-0/+18
* | | Merge commit 'rails/master'Emilio Tagua2009-08-102-5/+21
|\| |
| * | Allow delegating to nil, because the method might actually exist on itBryan Helmkamp2009-08-102-5/+21
* | | Merge commit 'rails/master'Emilio Tagua2009-08-1011-186/+247
|\| |
| * | Rewrite hm:t#create tests using assert_no_difference and assert_differencePratik Naik2009-08-101-12/+8
| * | Remove unnecessary scoping for creating hm:t join recordPratik Naik2009-08-101-3/+4
| * | Remove unnecessary scoping and validation checks from hm:t#createPratik Naik2009-08-101-1/+1
| * | Unify hm:t#create and create! implementationPratik Naik2009-08-101-17/+13
| * | Extract common dirty tracking methods in AMoJoshua Peek2009-08-103-114/+122
| * | AMo overrides alias_attribute and manages aliasing all known attribute method...Joshua Peek2009-08-102-17/+10
| * | Centralize attr method name concatenation in AttributeMethodMatchJoshua Peek2009-08-101-11/+22
| * | Fixed typo in test name and CHANGELOG [#3017 state:resolved]Arthur Zapparoli2009-08-102-3/+3
| * | Move :with/:without check outside the method generated by validates_format_ofPratik Naik2009-08-101-6/+6
| * | Add validates_format_of :without => /regexp/ option [Elliot Winkler, Peer Allan]Elliot Winkler2009-08-103-8/+64
| |/
* | Merge commit 'rails/master'Emilio Tagua2009-08-10146-395/+2326
|\|
| * find_cmd should return the full path of the db commandKamal Fariz Mahyuddin2009-08-101-4/+8
| * Introduce grouped_collection_select helper.codeape2009-08-093-0/+103
| * Correctly handle offsets in Multibyte::Chars#index and #rindex.Erik Ostrom2009-08-092-4/+11
| * Add tests for scoping schema_migrations index by global table prefix and suffixCristi Balan2009-08-091-0/+18
| * Use table prefix and suffix for schema_migrations index.Tim Peters2009-08-091-1/+1
| * Introduce validates_with to encapsulate attribute validations in a class.Jeff Dean2009-08-096-1/+255
| * Add support for errors in JSON format.Fabien Jakimowicz2009-08-094-26/+83
| * Fixing isolation testJay Pignata2009-08-091-1/+1
| * Fix that JSON parser fails to read escaped backslashes.Daniel Sheppard2009-08-092-4/+9
| * PostgreSQL: XML datatype supportLeonardo Borges2009-08-096-25/+81
| * raises an exception on habtm join table inserts if join table contains a prim...Jaime Bellmyer2009-08-092-3/+26
| * raises exception (ActiveRecord::ConfigurationError with message) on habtm ass...Jaime Bellmyer2009-08-097-0/+99
| * Fix that creating a table whose primary key prefix type is :table_name genera...Morgan Schweers2009-08-092-3/+3
| * Fix test dependency on taggingsJeremy Kemper2009-08-091-1/+2
| * Fix that counter_cache breaks with has_many :dependent => :nullify.Gabe da Silveira2009-08-094-3/+32