aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
| * | | | | | | | | | use LIMIT SQL word in first - Closes #2783Damien Mathieu2011-09-052-1/+10
|/ / / / / / / / / /
* | / / / / / / / / add blanks between methodsVijay Dev2011-09-051-0/+3
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #2868 from arunagw/batches_test_pg_masterJon Leighton2011-09-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sort here to make sure the order is ok.Arun Agrawal2011-09-051-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2713 from FLOChip/500-fixedJosé Valim2011-09-051-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove misleading line on 500 error page.Teng Siong Ong2011-08-271-1/+0
| * | | | | | | | | fixed 500 error message which is misleading by suggesting all rails apps have...Jared Tame2011-08-271-1/+1
* | | | | | | | | | Remove empty testSantiago Pastorino2011-09-051-3/+0
* | | | | | | | | | Merge pull request #2863 from raybaxter/silence_unitialized_instance_variable...Santiago Pastorino2011-09-041-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Tests shouldn't produce warningsRay Baxter2011-09-041-0/+5
* | | | | | | | | | | Merge pull request #2861 from guilleiguaran/assets-fix-changelogSantiago Pastorino2011-09-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add entry about Asset behaviour fix to ActionPack ChangeLogGuillermo Iguaran2011-09-041-0/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2860 from guilleiguaran/fix-assets-behaviorSantiago Pastorino2011-09-042-2/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, c...Guillermo Iguaran2011-09-042-2/+28
| |/ / / / / / / / /
* | | | | | | | | | * is not allowed in windows file names. Closes #2574 #2847Santiago Pastorino2011-09-042-1/+1
* | | | | | | | | | Merge pull request #2855 from arunagw/fix_find_in_batches_masterJon Leighton2011-09-043-1/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | We need to recorder here. Need to drop the order from default scope.Arun Agrawal2011-09-053-1/+31
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2852 from milandobrota/remove_unneeded_explicit_nil_checksJon Leighton2011-09-047-11/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | if ... nil? is more expensive than unlessMilan Dobrota2011-09-047-11/+11
|/ / / / / / / /
* | | | | | | | Merge docrails, resolving conflicts in the assets guideVijay Dev2011-09-049-24/+26
|\ \ \ \ \ \ \ \