aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use the supplied bind valuesAaron Patterson2011-09-071-1/+1
* Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails into rawrAaron Patterson2011-09-072-6/+10
* Merge pull request #2914 from yahonda/add_rownum_to_test_first_and_lastJon Leighton2011-09-071-2/+2
|\
| * Add ROWNUM to test first and last to support Oracle.Yasuo Honda2011-09-071-2/+2
* | Merge pull request #2904 from guilleiguaran/refactor-assets-testsSantiago Pastorino2011-09-071-13/+14
|\ \
| * | Refactor assets tests to use add_to_config instead of creating initializers w...Guillermo Iguaran2011-09-061-13/+14
* | | Merge pull request #2499 from akaspick/assert_select_email_fixJon Leighton2011-09-072-2/+21
|\ \ \
| * | | fix assert_select_email to work on non-multipart emails as well as converting...Andrew Kaspick2011-08-112-2/+21
* | | | Merge pull request #2911 from toolmantim/patch-1Jon Leighton2011-09-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already pr...Tim Lucas2011-09-071-1/+1
|/ / /
* | | Merge pull request #2905 from nhocki/patch-1Vijay Dev2011-09-071-1/+1
|\ \ \
| * | | Nicolás Hock Isaza2011-09-061-1/+1
| | |/ | |/|
* | | Don't include any of includes, preload, joins, eager_load in the through asso...Jon Leighton2011-09-072-4/+6
* | | Merge pull request #2485 from akaspick/exists_fixJon Leighton2011-09-072-1/+12
|\ \ \ | |/ / |/| |
| * | fix exists? to return false if passed nil (which may come from a missing URL ...Andrew Kaspick2011-08-102-1/+12
* | | Merge pull request #2897 from rsutphin/ar31-remove_connectionAaron Patterson2011-09-063-3/+22
* | | Eliminate newlines in basic auth. fixes #2882Aaron Patterson2011-09-062-1/+9
* | | Database adapters use a statement pool.Aaron Patterson2011-09-063-8/+46
* | | adding a statement pool for mysql and sqlite3Aaron Patterson2011-09-063-9/+102
* | | Merge pull request #2893 from dmathieu/errors_has_keyAaron Patterson2011-09-062-0/+7
|\ \ \
| * | | add has_key? to ActiveModel::ErrorsDamien Mathieu2011-09-062-0/+7
|/ / /
* | | Merge pull request #2577 from rails-noob/masterSantiago Pastorino2011-09-062-1/+51
|\ \ \
| * | | Fix bug #2579.rails-noob2011-09-062-1/+51
* | | | Merge pull request #2889 from guilleiguaran/perform-caching-assetsSantiago Pastorino2011-09-062-1/+10
|\ \ \ \
| * | | | config.action_controller.perform_caching isn't used anymore in assets pipelin...Guillermo Iguaran2011-09-062-1/+10
* | | | | Nested through associations: preloads from the default scope of a through mod...Jon Leighton2011-09-062-1/+10
* | | | | Ensure we are not comparing a string with a symbol in HasManyAssociation#inve...Jon Leighton2011-09-063-2/+12
* | | | | Make the logic easier to readJon Leighton2011-09-061-4/+7
* | | | | Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they h...Jon Leighton2011-09-062-0/+25
* | | | | Merge pull request #2883 from dmathieu/fix_testJon Leighton2011-09-061-1/+1
|\ \ \ \ \
| * | | | | #first doesn't take an order in this testDamien Mathieu2011-09-061-1/+1
* | | | | | Merge pull request #2851 from dasch/patch-6Jon Leighton2011-09-061-5/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | No need to use a begin block thereDaniel Schierbeck2011-09-041-5/+3
* | | | | | Bump uglifier upSantiago Pastorino2011-09-051-1/+1
* | | | | | Merge pull request #2870 from arunagw/uglifier_bumpSantiago Pastorino2011-09-051-1/+1
|\ \ \ \ \ \
| * | | | | | Uglifier bumpArun Agrawal2011-09-051-1/+1
* | | | | | | Merge pull request #2877 from dmathieu/fix_tests_pg_18Santiago Pastorino2011-09-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | first and last orders the records by idDamien Mathieu2011-09-061-2/+2
* | | | | | | | Merge pull request #2716 from jbbarth/fix_invert_rename_indexAaron Patterson2011-09-052-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed bad options order in ActiveRecord::Migration::CommandRecorder#invert_re...jbbarth2011-08-282-3/+3
* | | | | | | | | Don't find belongs_to target when the foreign_key is NULL. Fixes #2828Georg Friedrich2011-09-052-0/+10
* | | | | | | | | Merge pull request #2873 from guilleiguaran/remove-unused-configSantiago Pastorino2011-09-051-3/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused config variable from test.rb templateGuillermo Iguaran2011-09-051-3/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2872 from sikachu/content_tag_html_safeSantiago Pastorino2011-09-052-1/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure that result from content_tag_for with collection is html_safePrem Sichanugrist2011-09-052-1/+13
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2815 from avakhov/current-page-non-get-requestsSantiago Pastorino2011-09-052-2/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | current_page? returns false for non-GET requestsAlexey Vakhov2011-09-022-2/+16
* | | | | | | | | | Merge pull request #2799 from tomstuart/3-1-stableSantiago Pastorino2011-09-052-3/+39
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #2789 from dmathieu/limit_first_lastJon Leighton2011-09-052-2/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use LIMIT sql word in last when it's possibleDamien Mathieu2011-09-052-2/+23