aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #503 from smartinez87/conventionsJosé Valim2011-05-105-30/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Follow code conventions on some testsSebastian Martinez2011-05-105-30/+30
|/ / /
* | | Merge pull request #501 from guilleiguaran/patch-2José Valim2011-05-101-0/+1
|\ \ \
| * | | Adding .sass-cache to gitignore templateGuillermo Iguaran2011-05-101-0/+1
|/ / /
* | | Add test to specify that attributes from an association's conditions should b...Jon Leighton2011-05-104-4/+28
* | | Remove unnecessary '|| {}'Jon Leighton2011-05-101-1/+1
* | | Get around weird missing constant error caused by AS instead of simply raisin...José Valim2011-05-112-26/+37
* | | Don't use mass-assignment protection when applying the scoped.scope_for_creat...Jon Leighton2011-05-103-3/+16
* | | make sure log file is written in binary mode. fixes #497Aaron Patterson2011-05-102-0/+41
* | | Merge pull request #499 from smartinez87/csvJosé Valim2011-05-101-2/+2
|\ \ \
| * | | impact guides with no CSV fixture supportSebastian Martinez2011-05-101-2/+2
|/ / /
* | | Need it declared tooDavid Heinemeier Hansson2011-05-101-0/+1
* | | Include lib/assets for sprocket pathsDavid Heinemeier Hansson2011-05-101-0/+1
* | | Merge pull request #498 from vatrai/minor_cleaningJosé Valim2011-05-101-11/+11
|\ \ \
| * | | minor cleaning with new api methodVishnu Atrai2011-05-111-11/+11
|/ / /
* | | deprecating CSV fixture supportAaron Patterson2011-05-104-55/+7
* | | deprecating read_csv_fixture_files methodAaron Patterson2011-05-101-0/+2
* | | Merge pull request #490 from vijaydev/patch-4Piotr Sarnacki2011-05-101-1/+1
|\ \ \
| * | | Replace LH with GitHub url for filing issuesVijay Dev2011-05-101-1/+1
* | | | Merge pull request #495 from vatrai/minor_fixesPiotr Sarnacki2011-05-103-3/+3
|\ \ \ \
| * | | | minor cleaningVishnu Atrai2011-05-103-3/+3
| |/ / /
* | | | Merge pull request #494 from vijaydev/patch-5José Valim2011-05-101-1/+1
|\ \ \ \
| * | | | Use all in place of find(:all)Vijay Dev2011-05-101-1/+1
|/ / / /
* | | | Merge pull request #493 from guilleiguaran/changelog-fixesAaron Patterson2011-05-107-4/+280
|\ \ \ \
| * | | | Merging 3.0.x CHANGELOGsGuillermo Iguaran2011-05-107-4/+280
* | | | | Merge pull request #492 from jaw6/masterJosé Valim2011-05-104-4/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Methods that return nil should not be considered YAMLJoshua Wehner2011-05-104-4/+10
| | |/ / | |/| |
* / | | Update sprocket commentsDavid Heinemeier Hansson2011-05-102-3/+8
|/ / /
* | | Merge pull request #487 from vijaydev/patch-3Xavier Noria2011-05-101-2/+2
|\ \ \
| * | | s/javascript/JavaScriptVijay Dev2011-05-101-2/+2
|/ / /
* | | Fix previous commit by allowing a proc to be given as response_body. This is ...José Valim2011-05-103-34/+57
* | | Merge pull request #446 from danielstutzman/response_body_is_procJosé Valim2011-05-101-0/+38
|\ \ \
| * | | New test: setting response_body to a Proc should be supported.Daniel Stutzman2011-05-071-0/+38
* | | | Merge pull request #484 from slainer68/masterJosé Valim2011-05-102-0/+8
|\ \ \ \
| * | | | Puts ActiveRecord::SessionStore attributes in white list, fixes #483slainer682011-05-102-0/+8
|/ / / /
* | | | Merge pull request #482 from vijaydev/patch-2José Valim2011-05-101-2/+2
|\ \ \ \
| * | | | Fix typos in IM documentationVijay Dev2011-05-101-2/+2
|/ / / /
* | | | Document identity map inconsistency with associations, closes #474.José Valim2011-05-101-1/+28
* | | | Fix #480. Passing nil to create association works.José Valim2011-05-101-1/+1
* | | | Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".José Valim2011-05-101-26/+27
* | | | Add failing tests according to #479.José Valim2011-05-101-0/+15
* | | | Add failing tests, according to #480.José Valim2011-05-101-0/+14
* | | | Ensure assign_attributes and update_attributes do not fail on nil, closes #478.José Valim2011-05-103-0/+10
* | | | Add tests for content_for() for read, closes #475.José Valim2011-05-102-6/+18
| |/ / |/| |
* | | Update copyright year in Active Resource and Active SupportVijay Dev2011-05-092-2/+2
* | | Disable identity map by default. Detailed documentation will be pushed later.José Valim2011-05-101-5/+0
* | | use a null byte as a bind parameter substitute as it is not allowed in normal...Aaron Patterson2011-05-093-12/+59
* | | Merge pull request #471 from joshk/remove_as_concernJosé Valim2011-05-091-2/+1
|\ \ \
| * | | removed an unneed AS::Concern from AR::IdentityMapJosh Kalderimis2011-05-091-2/+1
|/ / /
* | | Merge pull request #461 from chrislwade/sorted-migrationsJosé Valim2011-05-091-6/+6
|\ \ \