aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MassAssignmentSecurity: add ability to specify your own sanitizerBogdan Gusiev2011-05-267-39/+57
| | | | | | Added an ability to specify your own behavior on mass assingment protection, controlled by option: ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer
* Merge pull request #1292 from arunagw/database_generatorsJosé Valim2011-05-251-2/+1
|\ | | | | Database.rake file fixed for load_generators
| * Database.rake file fixed for load_generatorsArun Agrawal2011-05-251-2/+1
|/
* Merge pull request #1290 from arunagw/load_generators_useJosé Valim2011-05-251-1/+1
|\ | | | | Using load_generators
| * Using load_generatorsArun Agrawal2011-05-251-1/+1
|/
* Use load_generators instead.José Valim2011-05-251-4/+2
|
* Merge pull request #1288 from guilleiguaran/railties-deprecationsJosé Valim2011-05-2515-287/+1
|\ | | | | Remove Railties deprecated methods
| * 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 ↵José Valim2011-05-251-7/+0
|\ \ | |/ |/| | | | | guilleiguaran/removing-test_load_generators_from_railties load_generators_from_railties was removed, remove test with error about it
| * load_generators_from_railties was removed, remove failing ↵Guillermo Iguaran2011-05-241-7/+0
| | | | | | | | test_load_generators_from_railties
* | Merge pull request #1286 from arunagw/fixed_failing_generators_testAaron Patterson2011-05-242-2/+3
|\ \ | |/ |/| Fixed failing tests for generators_test
| * 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
| | | | #1264.
* 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 ↵wycats2011-05-244-4/+12
| | | | generator blocks
* Move SCSS generators and default templates from Rails to the Sass Railtie ↵tomhuda2011-05-2412-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 ↵tomhuda2011-05-243-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_fixedJosé Valim2011-05-241-0/+1
|\ | | | | corrected/fixed the ActionMailer tests
| * corrected the ActionMailer tests which broke due to some code removed from ↵Josh Kalderimis2011-05-251-0/+1
|/ | | | ActionPack
* Merge pull request #1281 from joshk/removed_action_pack_deprecationsJosé Valim2011-05-2417-213/+6
|\ | | | | removed deprecated methods, and related tests, from ActionPack
| * 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 associations
| * | 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
| | | | | | | | | | | | (as well as having Relation#arel respect the default scope). Fixes #1233.
* | | Failing tests for #1233.Andrew White2011-05-242-0/+75
| |/ |/|
* | Merge pull request #1279 from dasch/patch-2José Valim2011-05-241-1/+1
|\ \ | | | | | | Use quotes consistently in Gemfile
| * | 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 Gemfile
| * | 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 nested objects
| * | Use set data structure to speed up circular reference checks on large/deeply ↵Andy Lindeman2011-05-231-4/+4
| | | | | | | | | | | | nested objects
* | | Merge pull request #1278 from vijaydev/rake-doctask-warning-fixJosé Valim2011-05-245-10/+10
|\ \ \ | | | | | | | | Fixes Rake::RDocTask deprecation warnings from Rake 0.9.0
| * | | 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 for Rake::GemPackageTask deprecation warnings from Rake 0.9.0
| * | | 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. ↵Aaron Patterson2011-05-241-1/+5
| | | | | | | | | | | | | | | | fixes #796
* | | | add tests surrounding behavior of save and save! for associations that have ↵Aaron Patterson2011-05-241-0/+26
| | | | | | | | | | | | | | | | validation errors
* | | | 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 ↵Aaron Patterson2011-05-241-3/+1
| | | | | | | | | | | | | | | | better trace without it
* | | | 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 tests
| * | | Removed deprecated ActionMailer API and related testsJosh Kalderimis2011-05-2410-1667/+6
| | | |