aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Depend on master uglifier for nowSantiago Pastorino2011-05-112-3/+3
* | | | | | | | | | | | | | | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculationsJon Leighton2011-05-113-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bug fixes:Fadzril Muhamad & Joseph Palermo2011-05-123-6/+18
* | | | | | | | | | | | | | | Add missing requiresSantiago Pastorino2011-05-112-0/+2
* | | | | | | | | | | | | | | Merge pull request #515 from joshk/patch-3José Valim2011-05-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | updated the ActiveSupport changelogJosh Kalderimis2011-05-111-0/+2
* | | | | | | | | | | | | | | | Merge pull request #519 from knapo/masterJosé Valim2011-05-112-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix assigning protected attributes by attributes=knapo2011-05-112-6/+10
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #516 from gucki/masterXavier Noria2011-05-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add missing require for ordered_hash dependencyCorin Langosch2011-05-111-0/+1
|/ / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / Don't remove the target if it has already been destroyedAndrew White2011-05-112-1/+10
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #513 from BlackBulletIV/patch-1Xavier Noria2011-05-112-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Modified NamedScopeTest to use CollectionAssociation.Michael Ebens2011-05-111-1/+1
| * | | | | | | | | | | | | | Modified CollectionAssociation to refer to the new class name.Michael Ebens2011-05-111-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Don't use select() values from the join model of a through association. Fixes...Jon Leighton2011-05-115-3/+23
* | | | | | | | | | | | | | 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 #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 defaultDavid Lee2011-05-102-2/+2
* | | | | | | | | | | | | | | Merge pull request #506 from dlee/custom_csrf_token_testsJosé Valim2011-05-102-9/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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 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
|/ / / / / / / / / / / / / /