| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | 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. | |||||
| * | | | Merge pull request #446 from danielstutzman/response_body_is_proc | José Valim | 2011-05-10 | 1 | -0/+38 | |
| |\ \ \ | | | | | | | | | New test: setting response_body to a Proc should be supported. | |||||
| | * | | | New test: setting response_body to a Proc should be supported. | Daniel Stutzman | 2011-05-07 | 1 | -0/+38 | |
| | | | | | ||||||
| * | | | | Merge pull request #484 from slainer68/master | José Valim | 2011-05-10 | 2 | -0/+8 | |
| |\ \ \ \ | | | | | | | | | | | Puts ActiveRecord::SessionStore attributes in white list, fixes #483 | |||||
| | * | | | | Puts ActiveRecord::SessionStore attributes in white list, fixes #483 | slainer68 | 2011-05-10 | 2 | -0/+8 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #482 from vijaydev/patch-2 | José Valim | 2011-05-10 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Fix typos in IM documentation | |||||
| | * | | | | Fix typos in IM documentation | Vijay Dev | 2011-05-10 | 1 | -2/+2 | |
| |/ / / / | ||||||
| * | | | | Document identity map inconsistency with associations, closes #474. | José Valim | 2011-05-10 | 1 | -1/+28 | |
| | | | | | ||||||
| * | | | | Fix #480. Passing nil to create association works. | José Valim | 2011-05-10 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f". | José Valim | 2011-05-10 | 1 | -26/+27 | |
| | | | | | | | | | | | | | | | | | | | | | Wrapping each Record.associations.build in a transaction is going to make several unneeded queries. Reverting this commit also fixes #479. | |||||
| * | | | | Add failing tests according to #479. | José Valim | 2011-05-10 | 1 | -0/+15 | |
| | | | | | ||||||
| * | | | | Add failing tests, according to #480. | José Valim | 2011-05-10 | 1 | -0/+14 | |
| | | | | | ||||||
| * | | | | Ensure assign_attributes and update_attributes do not fail on nil, closes #478. | José Valim | 2011-05-10 | 3 | -0/+10 | |
| | | | | | ||||||
| * | | | | Add tests for content_for() for read, closes #475. | José Valim | 2011-05-10 | 2 | -6/+18 | |
| | |/ / |/| | | ||||||
| * | | | Update copyright year in Active Resource and Active Support | Vijay Dev | 2011-05-09 | 2 | -2/+2 | |
| | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | | Disable identity map by default. Detailed documentation will be pushed later. | José Valim | 2011-05-10 | 1 | -5/+0 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |