aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1288 from guilleiguaran/railties-deprecationsJosé Valim2011-05-2515-287/+1
|\
| * Removing deprecated config.generators in Rails::RailtieGuillermo Iguaran2011-05-251-5/+0
| * Remove deprecated plugin generatorGuillermo Iguaran2011-05-2411-202/+0
| * Removing Deprecated Path API testsGuillermo Iguaran2011-05-241-53/+0
| * Removing deprecated config.paths.app.controller APIGuillermo Iguaran2011-05-242-27/+1
* | Merge pull request #1287 from guilleiguaran/removing-test_load_generators_fro...José Valim2011-05-251-7/+0
|\ \ | |/ |/|
| * load_generators_from_railties was removed, remove failing test_load_generator...Guillermo Iguaran2011-05-241-7/+0
* | Merge pull request #1286 from arunagw/fixed_failing_generators_testAaron Patterson2011-05-242-2/+3
|\ \ | |/ |/|
| * fixed test_deliver_is_notified need base_mailerArun Agrawal2011-05-251-0/+1
| * Fixed failing tests for generators_testArun Agrawal2011-05-251-2/+2
|/
* Everyone receives app as argument for consistency.José Valim2011-05-256-18/+22
* Actually this file may be invoked directly as well with --dev.José Valim2011-05-252-1/+3
* Streamline generators initialization flow.José Valim2011-05-257-23/+11
* Update default Gemfile to point to sass-rails, not sasswycats2011-05-241-1/+1
* Fix infinite recursion where a lazy default scope references a scope. Fixes #...Jon Leighton2011-05-254-4/+36
* Hide css:* and the default stylesheet from rails gwycats2011-05-241-1/+6
* Update generator config to support hiding namespaces and pass the app into ge...wycats2011-05-244-4/+12
* Move SCSS generators and default templates from Rails to the Sass Railtie (d4...tomhuda2011-05-2412-124/+61
* Change compressor API so that plugins can register default compressors for th...tomhuda2011-05-243-5/+11
* Merge pull request #1283 from joshk/actiom_mailer_tests_fixedJosé Valim2011-05-241-0/+1
|\
| * corrected the ActionMailer tests which broke due to some code removed from Ac...Josh Kalderimis2011-05-251-0/+1
|/
* Merge pull request #1281 from joshk/removed_action_pack_deprecationsJosé Valim2011-05-2417-213/+6
|\
| * removed deprecated methods, and related tests, from ActionPackJosh Kalderimis2011-05-2417-213/+6
* | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scopeJon Leighton2011-05-244-1/+16
|\ \
| * | Ignore :includes on through associationsAndrew White2011-05-244-1/+16
* | | 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
| |/ / / /