aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ensure that the surrounding code in Relation#to_a respects the default_scope ...Jon Leighton2011-05-241-17/+24
* Failing tests for #1233.Andrew White2011-05-242-0/+75
* Merge pull request #1279 from dasch/patch-2José Valim2011-05-241-1/+1
|\
| * Also use double quotes for #sourceDaniel Schierbeck2011-05-241-1/+1
* | Merge pull request #1279 from dasch/patch-2José Valim2011-05-241-7/+7
|\|
| * Use quotes consistently in GemfileDaniel Schierbeck2011-05-241-7/+7
|/
* Merge pull request #1239 from alindeman/masterJosé Valim2011-05-241-4/+4
|\
| * Use set data structure to speed up circular reference checks on large/deeply ...Andy Lindeman2011-05-231-4/+4
* | Merge pull request #1278 from vijaydev/rake-doctask-warning-fixJosé Valim2011-05-245-10/+10
|\ \
| * | fixes Rake::RDocTask deprecation warnings from rake 0.9.0Vijay Dev2011-05-255-10/+10
|/ /
* | Merge pull request #1274 from vijaydev/rake-packagetask-warning-fixJosé Valim2011-05-247-14/+14
|\ \
| * | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0Vijay Dev2011-05-247-14/+14
* | | rescue record invalid exceptions and return false from the save method. fixes...Aaron Patterson2011-05-241-1/+5
* | | add tests surrounding behavior of save and save! for associations that have v...Aaron Patterson2011-05-241-0/+26
* | | adding a test for create! with invalid associationsAaron Patterson2011-05-241-0/+9
* | | do not bother with assert_nothing_raised, the test will fail and we get a bet...Aaron Patterson2011-05-241-3/+1
* | | Add failing test case for issue 796Joey Butler2011-05-241-0/+9
|/ /
* | Merge pull request #1271 from joshk/remove_am_deprecated_methodsJosé Valim2011-05-2410-1667/+6
|\ \
| * | Removed deprecated ActionMailer API and related testsJosh Kalderimis2011-05-2410-1667/+6
* | | Merge pull request #1247 from arunagw/loading-fileAaron Patterson2011-05-241-83/+82
|\ \ \
| * | | Not loading file if PLATFORM not available. Arun Agrawal2011-05-241-83/+82
* | | | Merge pull request #1253 from arunagw/preformance_java_importAaron Patterson2011-05-241-1/+1
|\ \ \ \
| * | | | import to java_import. Arun Agrawal2011-05-241-1/+1
| |/ / /
* | | | Merge pull request #1251 from arunagw/java_importAaron Patterson2011-05-241-6/+6
|\ \ \ \
| * | | | Using java_import instead of import. Need to do this with rake 0.9.0 #jrubyArun Agrawal2011-05-241-6/+6
| |/ / /
* | / / Remove asserts for js ext stuff thats not used any moreDavid Heinemeier Hansson2011-05-241-3/+0
| |/ / |/| |
* | | Merge pull request #1268 from ernie/compute_asset_host_fixJosé Valim2011-05-241-3/+3
|\ \ \
| * | | Redundant condition in compute_asset_host is redundant.Ernie Miller2011-05-241-3/+3
* | | | Merge pull request #1267 from guilleiguaran/prefer-each-syntaxJosé Valim2011-05-242-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Prefer each instead of for on activesupportGuillermo Iguaran2011-05-241-1/+1
| * | | Prefer each instead of for in activeresourceGuillermo Iguaran2011-05-231-1/+1
| |/ /
* | | The asset pipeline is always on for new apps, dont need the legacy js ext stuffDavid Heinemeier Hansson2011-05-241-11/+0
* | | Merge pull request #1257 from dmathieu/yml_aliasDavid Heinemeier Hansson2011-05-243-4/+4
|\ \ \
| * | | properly reference yml alias nodesdmathieu2011-05-243-4/+4
* | | | Merge pull request #1262 from dmathieu/dummy_without_testsJosé Valim2011-05-242-1/+8
|\ \ \ \
| * | | | create the dummy app if there's no test_unit but there's a dummy_pathdmathieu2011-05-242-1/+8
|/ / / /
* / / / Fix failing test suite (please run tests before sending pull requests :S)José Valim2011-05-241-1/+2
|/ / /
* | | Remaining cleanup from changes to AssetTagHelpertomhuda2011-05-244-12/+9
* | | Merge pull request #1255 from flippingbits/masterJosé Valim2011-05-242-1/+7
|\ \ \
| * | | Add test for gemspec of the generated engineStefan Sprenger2011-05-241-0/+6
| * | | Add folders app and config to the engine's gemspec if they're availableStefan Sprenger2011-05-241-1/+1
|/ / /
* | | Merge pull request #1243 from smartinez87/warningsJosé Valim2011-05-233-13/+13
|\ \ \ | |/ / |/| |
| * | Parenthesize arguments when the first one is a Regexp literal.Sebastian Martinez2011-05-233-13/+13
* | | Make sure that Sprockets::Helpers::RailsHelper can be foundwycats2011-05-232-1/+8
|/ /
* | Merge pull request #1241 from smartinez87/extra-spaceSantiago Pastorino2011-05-237-8/+8
|\ \
| * | Remove extra white-space on some exception messages.Sebastian Martinez2011-05-237-8/+8
* | | Move the last pockets of Sprockets stuff into the Sprockets directorywycats2011-05-235-25/+16
* | | Move javascript/css helpers into the Sprockets helper and just have them over...wycats2011-05-233-55/+56
* | | Start moving some logic from being embedded in AV into the Rails Sprockets ex...wycats2011-05-235-62/+60
|/ /
* | fixing 1.8 support for new fixture testsAaron Patterson2011-05-233-4/+9