aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bug fixes:Fadzril Muhamad & Joseph Palermo2011-05-123-6/+18
| | | | | | - If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not. - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count. Looks like it was broken here: https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265
* Don't use select() values from the join model of a through association. ↵Jon Leighton2011-05-115-3/+23
| | | | Fixes #508.
* Bring back obj.association_loaded? as a deprecated method. Fixes #472.Jon Leighton2011-05-112-0/+22
|
* Merge pull request #509 from gucki/masterJon Leighton2011-05-111-1/+1
|\ | | | | fix bug in usage example of #unscoped
| * fix bug in usage example of #unscopedCorin Langosch2011-05-111-1/+1
|/
* Merge pull request #507 from dlee/fix_identity_map_testsJosé Valim2011-05-102-2/+2
|\ | | | | Fix tests to reflect IdentityMap no longer default
| * Fix tests to reflect IdentityMap no longer defaultDavid Lee2011-05-102-2/+2
| | | | | | | | Broke in 0e1dcae1857db4f6721561caff38d8be748d0b40
* | Merge pull request #506 from dlee/custom_csrf_token_testsJosé Valim2011-05-102-9/+33
|\ \ | | | | | | Test csrf token param name customization
| * | Test csrf token param name customizationDavid Lee2011-05-102-9/+33
| |/
* | Merge pull request #503 from smartinez87/conventionsJosé Valim2011-05-105-30/+30
|\ \ | |/ |/| Follow code conventions on some tests
| * 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 template
| * Adding .sass-cache to gitignore templateGuillermo Iguaran2011-05-101-0/+1
|/
* Add test to specify that attributes from an association's conditions should ↵Jon Leighton2011-05-104-4/+28
| | | | be assigned without mass-assignment protection when a record is built on the association.
* Remove unnecessary '|| {}'Jon Leighton2011-05-101-1/+1
|
* Get around weird missing constant error caused by AS instead of simply ↵José Valim2011-05-112-26/+37
| | | | raising NameError, closes #477.
* Don't use mass-assignment protection when applying the ↵Jon Leighton2011-05-103-3/+16
| | | | scoped.scope_for_create. Fixes #481.
* 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 support
| * 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 method all
| * 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 issues
| * 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 cleaning
| * | 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)
| * | 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 CHANGELOGs
| * | Merging 3.0.x CHANGELOGsGuillermo Iguaran2011-05-107-4/+280
| | |
* | | Merge pull request #492 from jaw6/masterJosé Valim2011-05-104-4/+10
|\ \ \ | |_|/ |/| | Serialized methods that return nil should not be considered YAML
| * | 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/JavaScript
| * | 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
| | | | | | | | deprecated and is going to be removed in future releases.
* | 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.
| * | 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 #483
| * | | 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 documentation
| * | | 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
| | | | | | | | | | | | | | | 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é Valim2011-05-101-0/+15
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:21:07 +0000