| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Removing deprecated config.paths.app.controller API | Guillermo Iguaran | 2011-05-24 | 2 | -27/+1 |
| | | |||||
| * | Merge pull request #1286 from arunagw/fixed_failing_generators_test | Aaron Patterson | 2011-05-24 | 2 | -2/+3 |
| |\ | | | | | Fixed failing tests for generators_test | ||||
| | * | fixed test_deliver_is_notified need base_mailer | Arun Agrawal | 2011-05-25 | 1 | -0/+1 |
| | | | |||||
| | * | Fixed failing tests for generators_test | Arun Agrawal | 2011-05-25 | 1 | -2/+2 |
| |/ | |||||
| * | Everyone receives app as argument for consistency. | José Valim | 2011-05-25 | 6 | -18/+22 |
| | | |||||
| * | Actually this file may be invoked directly as well with --dev. | José Valim | 2011-05-25 | 2 | -1/+3 |
| | | |||||
| * | Streamline generators initialization flow. | José Valim | 2011-05-25 | 7 | -23/+11 |
| | | |||||
| * | Update default Gemfile to point to sass-rails, not sass | wycats | 2011-05-24 | 1 | -1/+1 |
| | | |||||
| * | Fix infinite recursion where a lazy default scope references a scope. Fixes ↵ | Jon Leighton | 2011-05-25 | 4 | -4/+36 |
| | | | | | #1264. | ||||
| * | Hide css:* and the default stylesheet from rails g | wycats | 2011-05-24 | 1 | -1/+6 |
| | | |||||
| * | Update generator config to support hiding namespaces and pass the app into ↵ | wycats | 2011-05-24 | 4 | -4/+12 |
| | | | | | generator blocks | ||||
| * | Move SCSS generators and default templates from Rails to the Sass Railtie ↵ | tomhuda | 2011-05-24 | 12 | -124/+61 |
| | | | | | | | | | (d435726312601edb3ba6f97b34f562221f72c1f8). * Sass gem registers a compressor * Sass gem registers generators for assets and scaffold * Create a default stylesheet_engine ("css") for apps that remove the Sass gem | ||||
| * | Change compressor API so that plugins can register default compressors for ↵ | tomhuda | 2011-05-24 | 3 | -5/+11 |
| | | | | | their stylesheet or JS engines and still allow the user to turn off compression | ||||
| * | Merge pull request #1283 from joshk/actiom_mailer_tests_fixed | José Valim | 2011-05-24 | 1 | -0/+1 |
| |\ | | | | | corrected/fixed the ActionMailer tests | ||||
| | * | corrected the ActionMailer tests which broke due to some code removed from ↵ | Josh Kalderimis | 2011-05-25 | 1 | -0/+1 |
| |/ | | | | ActionPack | ||||
| * | Merge pull request #1281 from joshk/removed_action_pack_deprecations | José Valim | 2011-05-24 | 17 | -213/+6 |
| |\ | | | | | removed deprecated methods, and related tests, from ActionPack | ||||
| | * | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 17 | -213/+6 |
| | | | |||||
| * | | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope | Jon Leighton | 2011-05-24 | 4 | -1/+16 |
| |\ \ | | | | | | | Ignore :includes on through associations | ||||
| | * | | Ignore :includes on through associations | Andrew White | 2011-05-24 | 4 | -1/+16 |
| | | | | |||||
| * | | | Ensure that the surrounding code in Relation#to_a respects the default_scope ↵ | Jon Leighton | 2011-05-24 | 1 | -17/+24 |
| | | | | | | | | | | | | | (as well as having Relation#arel respect the default scope). Fixes #1233. | ||||
| * | | | Failing tests for #1233. | Andrew White | 2011-05-24 | 2 | -0/+75 |
| | |/ |/| | |||||
| * | | Merge pull request #1279 from dasch/patch-2 | José Valim | 2011-05-24 | 1 | -1/+1 |
| |\ \ | | | | | | | Use quotes consistently in Gemfile | ||||
| | * | | Also use double quotes for #source | Daniel Schierbeck | 2011-05-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1279 from dasch/patch-2 | José Valim | 2011-05-24 | 1 | -7/+7 |
| |\| | | | | | | | | Use quotes consistently in Gemfile | ||||
| | * | | Use quotes consistently in Gemfile | Daniel Schierbeck | 2011-05-24 | 1 | -7/+7 |
| |/ / | |||||
| * | | Merge pull request #1239 from alindeman/master | José Valim | 2011-05-24 | 1 | -4/+4 |
| |\ \ | | | | | | | Use set data structure to speed up circular reference checks on large/deeply nested objects | ||||
| | * | | Use set data structure to speed up circular reference checks on large/deeply ↵ | Andy Lindeman | 2011-05-23 | 1 | -4/+4 |
| | | | | | | | | | | | | | nested objects | ||||
| * | | | Merge pull request #1278 from vijaydev/rake-doctask-warning-fix | José Valim | 2011-05-24 | 5 | -10/+10 |
| |\ \ \ | | | | | | | | | Fixes Rake::RDocTask deprecation warnings from Rake 0.9.0 | ||||
| | * | | | fixes Rake::RDocTask deprecation warnings from rake 0.9.0 | Vijay Dev | 2011-05-25 | 5 | -10/+10 |
| |/ / / | |||||
| * | | | Merge pull request #1274 from vijaydev/rake-packagetask-warning-fix | José Valim | 2011-05-24 | 7 | -14/+14 |
| |\ \ \ | | | | | | | | | Fixes for Rake::GemPackageTask deprecation warnings from Rake 0.9.0 | ||||
| | * | | | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 | Vijay Dev | 2011-05-24 | 7 | -14/+14 |
| | | | | | |||||
| * | | | | rescue record invalid exceptions and return false from the save method. ↵ | Aaron Patterson | 2011-05-24 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | fixes #796 | ||||
| * | | | | add tests surrounding behavior of save and save! for associations that have ↵ | Aaron Patterson | 2011-05-24 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | validation errors | ||||
| * | | | | adding a test for create! with invalid associations | Aaron Patterson | 2011-05-24 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | do not bother with assert_nothing_raised, the test will fail and we get a ↵ | Aaron Patterson | 2011-05-24 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | better trace without it | ||||
| * | | | | Add failing test case for issue 796 | Joey Butler | 2011-05-24 | 1 | -0/+9 |
| |/ / / | |||||
| * | | | Merge pull request #1271 from joshk/remove_am_deprecated_methods | José Valim | 2011-05-24 | 10 | -1667/+6 |
| |\ \ \ | | | | | | | | | Removed deprecated ActionMailer API and related tests | ||||
| | * | | | Removed deprecated ActionMailer API and related tests | Josh Kalderimis | 2011-05-24 | 10 | -1667/+6 |
| | | | | | |||||
| * | | | | Merge pull request #1247 from arunagw/loading-file | Aaron Patterson | 2011-05-24 | 1 | -83/+82 |
| |\ \ \ \ | | | | | | | | | | | Not loading file if PLATFORM not available. | ||||
| | * | | | | Not loading file if PLATFORM not available. | Arun Agrawal | 2011-05-24 | 1 | -83/+82 |
| | | | | | | |||||
| * | | | | | Merge pull request #1253 from arunagw/preformance_java_import | Aaron Patterson | 2011-05-24 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | import to java_import. | ||||
| | * | | | | | import to java_import. | Arun Agrawal | 2011-05-24 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1251 from arunagw/java_import | Aaron Patterson | 2011-05-24 | 1 | -6/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | Using java_import instead of import. Need to do this with rake 0.9.0 #jruby | ||||
| | * | | | | | Using java_import instead of import. Need to do this with rake 0.9.0 #jruby | Arun Agrawal | 2011-05-24 | 1 | -6/+6 |
| | |/ / / / | |||||
| * | / / / | Remove asserts for js ext stuff thats not used any more | David Heinemeier Hansson | 2011-05-24 | 1 | -3/+0 |
| | |/ / / |/| | | | |||||
| * | | | | Merge pull request #1268 from ernie/compute_asset_host_fix | José Valim | 2011-05-24 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | Redundant condition in compute_asset_host is redundant. | ||||
| | * | | | | Redundant condition in compute_asset_host is redundant. | Ernie Miller | 2011-05-24 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #1267 from guilleiguaran/prefer-each-syntax | José Valim | 2011-05-24 | 2 | -2/+2 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Prefer 'each' syntax instead of 'for in' | ||||
| | * | | | | Prefer each instead of for on activesupport | Guillermo Iguaran | 2011-05-24 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Prefer each instead of for in activeresource | Guillermo Iguaran | 2011-05-23 | 1 | -1/+1 |
| | |/ / / | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |