aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't shadow outer local variable.Emilio Tagua2011-02-151-2/+2
* Run tests without IdentityMap when IM=false is given.Emilio Tagua2011-02-156-15/+23
* Remove identity map from benchmark script.Emilio Tagua2011-02-151-7/+0
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-15430-9198/+12029
|\
| * bad tests are badAaron Patterson2011-02-141-18/+0
| * remove accidental raise!Aaron Patterson2011-02-141-1/+0
| * removing irrelevant testAaron Patterson2011-02-142-18/+1
| * Merge branch 'fixtures'Aaron Patterson2011-02-141-28/+28
| |\
| | * remove unused methodsAaron Patterson2011-02-142-40/+0
| | * extract database activity out of Fixtures instancesAaron Patterson2011-02-141-7/+23
| | * extract rows that should be inserted to a methodAaron Patterson2011-02-141-12/+12
| | * fixtures will return a list of tables that may be effected, delete existing f...Aaron Patterson2011-02-142-6/+30
| * | Merge remote branch 'jonleighton/association_fixes'Aaron Patterson2011-02-1423-117/+171
| |\ \ | | |/ | |/|
| | * Add a transaction wrapper in add_to_target. This means that #build will now a...Jon Leighton2011-02-141-27/+27
| | * Inline ensure_owner_is_persisted! as it is only called from one placeJon Leighton2011-02-141-8/+4
| | * @target should always be an arrayJon Leighton2011-02-141-1/+2
| | * Rename add_record_to_target_with_callbacks to add_to_targetJon Leighton2011-02-142-5/+5
| | * Don't pass the block through build_recordJon Leighton2011-02-141-10/+8
| | * Move create and create! next to buildJon Leighton2011-02-141-21/+21
| | * Get rid of create_record as it is not only used in one placeJon Leighton2011-02-141-8/+7
| | * Get rid of AssociationCollection#save_recordJon Leighton2011-02-145-26/+26
| | * Fix test/cases/connection_pool_test.rb for sqlite3 in-memory dbJon Leighton2011-02-141-0/+10
| | * Add interpolation of association conditions back in, in the form of proc { .....Jon Leighton2011-02-1418-47/+97
| * | HabtmFixtures class is no longer neededAaron Patterson2011-02-141-31/+22
| * | Add test to prevent regression on namespace root nested in a resourceAndrew White2011-02-141-0/+9
| * | Fix named route helper for routes nested inside deeply nested resourcesAndrew White2011-02-142-2/+10
| |/
| * Add notes on how to override the default :id constraint [#5994 state:resolved]Andrew White2011-02-142-1/+12
| * Remove incorrect assert_recognizes exampleAndrew White2011-02-141-6/+0
| * Remove incorrect assert_recognizes exampleAndrew White2011-02-131-3/+0
| * Fix assert_recognizes with block constraints [#5805 state:resolved]Andrew White2011-02-134-6/+116
| * Add missing requireSantiago Pastorino2011-02-131-0/+1
| * Add Date#rfc3339 and Date#iso8601 to ASSantiago Pastorino2011-02-133-0/+17
| * Remove Relation#& alias for Relation#mergeErnie Miller2011-02-126-14/+12
| * switch over to Mysql2::Client#ping for the mysql2 connection checkBrian Lopez2011-02-121-4/+1
| * Make gem "ruby-debug19" require ruby-debugSantiago Pastorino2011-02-121-1/+1
| * added proper require for ruby-debug19 gem to generated GemfileWojciech Wnętrzak2011-02-121-1/+1
| * Allow for the format of time_tag in AP to be changed via an option argument.Josh Kalderimis2011-02-122-8/+16
| * Added time_tag helper to AP for HTML5 time tag [#5919 state:resolved]Sjoerd Andringa2011-02-123-2/+41
| * Fix table name collision due to incorrect alias count on certain joins.Ernie Miller2011-02-122-4/+11
| * Applied changes to stylesheet_link_tag from javascript_include_tag which corr...Josh Kalderimis2011-02-133-14/+38
| * This corrects two issues with javascript_include_tag, the order at which they...Josh Kalderimis2011-02-132-5/+47
| * Remove duplicated action pack tests added to fix issue with fields_for, neste...Carlos Antonio da Silva2011-02-121-42/+0
| * Add block support to button_tag helperTom Stuart2011-02-122-4/+18
| * Make type="submit" the default for button_tag helperTom Stuart2011-02-122-7/+12
| * Updated the json date regex to recognize xmlschema formatted date times durin...Josh Kalderimis2011-02-122-1/+5
| * key habtm fixtures off table nameAaron Patterson2011-02-111-5/+5
| * Fixture class no longer needs a reference to the database connectionAaron Patterson2011-02-111-16/+4
| * convert fixtures to a list of hashes to insertAaron Patterson2011-02-111-2/+6
| * fixture should quack like a hashAaron Patterson2011-02-111-1/+9
| * Fixtures class constantizes this value, so no need to do it twiceAaron Patterson2011-02-111-3/+3