Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add missing requires | Santiago Pastorino | 2011-05-11 | 2 | -0/+2 |
| | |||||
* | Merge pull request #515 from joshk/patch-3 | José Valim | 2011-05-11 | 1 | -0/+2 |
|\ | | | | | updated the ActiveSupport changelog | ||||
| * | updated the ActiveSupport changelog | Josh Kalderimis | 2011-05-11 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #519 from knapo/master | José Valim | 2011-05-11 | 2 | -6/+10 |
|\ \ | | | | | | | `guard_protected_attributes` has invalid assignment to be always true in attributes= | ||||
| * | | Fix assigning protected attributes by attributes= | knapo | 2011-05-11 | 2 | -6/+10 |
|/ / | |||||
* | | Merge pull request #516 from gucki/master | Xavier Noria | 2011-05-11 | 1 | -0/+1 |
|\ \ | | | | | | | add missing require for ordered_hash dependency | ||||
| * | | add missing require for ordered_hash dependency | Corin Langosch | 2011-05-11 | 1 | -0/+1 |
|/ / | |||||
* / | Don't remove the target if it has already been destroyed | Andrew White | 2011-05-11 | 2 | -1/+10 |
|/ | |||||
* | Merge pull request #513 from BlackBulletIV/patch-1 | Xavier Noria | 2011-05-11 | 2 | -2/+2 |
|\ | | | | | Modified CollectionAssociation documentation to refer to the new class name | ||||
| * | Modified NamedScopeTest to use CollectionAssociation. | Michael Ebens | 2011-05-11 | 1 | -1/+1 |
| | | |||||
| * | Modified CollectionAssociation to refer to the new class name. | Michael Ebens | 2011-05-11 | 1 | -1/+1 |
|/ | |||||
* | Don't use select() values from the join model of a through association. ↵ | Jon Leighton | 2011-05-11 | 5 | -3/+23 |
| | | | | Fixes #508. | ||||
* | Bring back obj.association_loaded? as a deprecated method. Fixes #472. | Jon Leighton | 2011-05-11 | 2 | -0/+22 |
| | |||||
* | Merge pull request #509 from gucki/master | Jon Leighton | 2011-05-11 | 1 | -1/+1 |
|\ | | | | | fix bug in usage example of #unscoped | ||||
| * | fix bug in usage example of #unscoped | Corin Langosch | 2011-05-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #507 from dlee/fix_identity_map_tests | José Valim | 2011-05-10 | 2 | -2/+2 |
|\ | | | | | Fix tests to reflect IdentityMap no longer default | ||||
| * | Fix tests to reflect IdentityMap no longer default | David Lee | 2011-05-10 | 2 | -2/+2 |
| | | | | | | | | Broke in 0e1dcae1857db4f6721561caff38d8be748d0b40 | ||||
* | | Merge pull request #506 from dlee/custom_csrf_token_tests | José Valim | 2011-05-10 | 2 | -9/+33 |
|\ \ | | | | | | | Test csrf token param name customization | ||||
| * | | Test csrf token param name customization | David Lee | 2011-05-10 | 2 | -9/+33 |
| |/ | |||||
* | | Merge pull request #503 from smartinez87/conventions | José Valim | 2011-05-10 | 5 | -30/+30 |
|\ \ | |/ |/| | Follow code conventions on some tests | ||||
| * | Follow code conventions on some tests | Sebastian Martinez | 2011-05-10 | 5 | -30/+30 |
|/ | |||||
* | Merge pull request #501 from guilleiguaran/patch-2 | José Valim | 2011-05-10 | 1 | -0/+1 |
|\ | | | | | Adding .sass-cache to gitignore template | ||||
| * | Adding .sass-cache to gitignore template | Guillermo Iguaran | 2011-05-10 | 1 | -0/+1 |
|/ | |||||
* | Add test to specify that attributes from an association's conditions should ↵ | Jon Leighton | 2011-05-10 | 4 | -4/+28 |
| | | | | be assigned without mass-assignment protection when a record is built on the association. | ||||
* | Remove unnecessary '|| {}' | Jon Leighton | 2011-05-10 | 1 | -1/+1 |
| | |||||
* | Get around weird missing constant error caused by AS instead of simply ↵ | José Valim | 2011-05-11 | 2 | -26/+37 |
| | | | | raising NameError, closes #477. | ||||
* | Don't use mass-assignment protection when applying the ↵ | Jon Leighton | 2011-05-10 | 3 | -3/+16 |
| | | | | scoped.scope_for_create. Fixes #481. | ||||
* | make sure log file is written in binary mode. fixes #497 | Aaron Patterson | 2011-05-10 | 2 | -0/+41 |
| | |||||
* | Merge pull request #499 from smartinez87/csv | José Valim | 2011-05-10 | 1 | -2/+2 |
|\ | | | | | impact guides with no CSV fixture support | ||||
| * | impact guides with no CSV fixture support | Sebastian Martinez | 2011-05-10 | 1 | -2/+2 |
|/ | |||||
* | Need it declared too | David Heinemeier Hansson | 2011-05-10 | 1 | -0/+1 |
| | |||||
* | Include lib/assets for sprocket paths | David Heinemeier Hansson | 2011-05-10 | 1 | -0/+1 |
| | |||||
* | Merge pull request #498 from vatrai/minor_cleaning | José Valim | 2011-05-10 | 1 | -11/+11 |
|\ | | | | | minor cleaning with new api method all | ||||
| * | minor cleaning with new api method | Vishnu Atrai | 2011-05-11 | 1 | -11/+11 |
|/ | |||||
* | deprecating CSV fixture support | Aaron Patterson | 2011-05-10 | 4 | -55/+7 |
| | |||||
* | deprecating read_csv_fixture_files method | Aaron Patterson | 2011-05-10 | 1 | -0/+2 |
| | |||||
* | Merge pull request #490 from vijaydev/patch-4 | Piotr Sarnacki | 2011-05-10 | 1 | -1/+1 |
|\ | | | | | Replace LH with GitHub url for filing issues | ||||
| * | Replace LH with GitHub url for filing issues | Vijay Dev | 2011-05-10 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #495 from vatrai/minor_fixes | Piotr Sarnacki | 2011-05-10 | 3 | -3/+3 |
|\ \ | | | | | | | minor cleaning | ||||
| * | | minor cleaning | Vishnu Atrai | 2011-05-10 | 3 | -3/+3 |
| |/ | |||||
* | | Merge pull request #494 from vijaydev/patch-5 | José Valim | 2011-05-10 | 1 | -1/+1 |
|\ \ | | | | | | | Use all in place of find(:all) | ||||
| * | | Use all in place of find(:all) | Vijay Dev | 2011-05-10 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #493 from guilleiguaran/changelog-fixes | Aaron Patterson | 2011-05-10 | 7 | -4/+280 |
|\ \ | | | | | | | Merging 3.0.x CHANGELOGs | ||||
| * | | Merging 3.0.x CHANGELOGs | Guillermo Iguaran | 2011-05-10 | 7 | -4/+280 |
| | | | |||||
* | | | Merge pull request #492 from jaw6/master | José Valim | 2011-05-10 | 4 | -4/+10 |
|\ \ \ | |_|/ |/| | | Serialized methods that return nil should not be considered YAML | ||||
| * | | Methods that return nil should not be considered YAML | Joshua Wehner | 2011-05-10 | 4 | -4/+10 |
| | | | |||||
* | | | Update sprocket comments | David Heinemeier Hansson | 2011-05-10 | 2 | -3/+8 |
|/ / | |||||
* | | Merge pull request #487 from vijaydev/patch-3 | Xavier Noria | 2011-05-10 | 1 | -2/+2 |
|\ \ | | | | | | | s/javascript/JavaScript | ||||
| * | | s/javascript/JavaScript | Vijay Dev | 2011-05-10 | 1 | -2/+2 |
|/ / | |||||
* | | Fix previous commit by allowing a proc to be given as response_body. This is ↵ | José Valim | 2011-05-10 | 3 | -34/+57 |
| | | | | | | | | deprecated and is going to be removed in future releases. |