aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* run bundler programmatically rather than shelling outXavier Noria2011-05-131-7/+3
* Merge pull request #538 from arunagw/update_rack_mountPiotr Sarnacki2011-05-132-1/+29
|\
| * Test added for getting route segment valuesArun Agrawal2011-05-131-0/+28
| * rack-mount gem updated.Arun Agrawal2011-05-131-1/+1
* | Update for sprockets/master context class apiJoshua Peek2011-05-121-1/+9
|/
* use #quietly in a few places, and s/silence/capture/ where intention is captureXavier Noria2011-05-132-12/+12
* Merge pull request #537 from amatsuda/update_scripts2Xavier Noria2011-05-121-1/+0
|\
| * eliminating the noiseAkira Matsuda2011-05-131-1/+0
|/
* new reporting method Kernel#quietlyXavier Noria2011-05-135-4/+26
* silences stderr to prevent an expected error message in the test suite from b...Xavier Noria2011-05-131-2/+1
* say something when running bundle commandsXavier Noria2011-05-131-0/+2
* say silence when you mean silenceXavier Noria2011-05-131-1/+1
* application and plugin generation run bundle check unless --skip-gemfileXavier Noria2011-05-136-15/+37
* removes duplicate testsXavier Noria2011-05-131-13/+0
* Don't use mass-assignment protection when setting foreign keys or association...Jon Leighton2011-05-123-9/+45
* Merge pull request #532 from amatsuda/update_scriptJosé Valim2011-05-121-4/+14
|\
| * Revert "Delegate everything to the generator"Akira Matsuda2011-05-131-4/+14
* | Merge pull request #531 from amatsuda/update_javascriptsJosé Valim2011-05-121-7/+2
|\ \
| * | remove update:javascripts rake taskAkira Matsuda2011-05-131-7/+2
| |/
* / The new release supposedly fixed things, but it is still b0rked -- comment ou...David Heinemeier Hansson2011-05-121-1/+1
|/
* Proper fixDavid Heinemeier Hansson2011-05-121-1/+1
* Fix the assets regexp for non-js/css filesDavid Heinemeier Hansson2011-05-121-1/+1
* Merge pull request #527 from joshk/deprecation_circular_dependencySantiago Pastorino2011-05-121-2/+0
|\
| * Remove a circular require in AS deprecations. This is safe as AS deprecations...Josh Kalderimis2011-05-121-2/+0
|/
* Merge pull request #524 from joshk/ar_create_mas_correctionJosé Valim2011-05-124-18/+44
|\
| * updated AR#create! to accept an options hash so the mass-assignment security ...Josh Kalderimis2011-05-124-18/+44
|/
* Merge pull request #227 from farski/masterSantiago Pastorino2011-05-112-6/+6
|\
| * Removed some redundant Time#change time options from beginning_of_ methods in...Chris Kalafarski2011-03-132-6/+6
* | Merge pull request #521 from seanmccann/patch-1Santiago Pastorino2011-05-111-1/+0
|\ \
| * | Remove extra line at end of development config file.Sean McCann2011-05-111-1/+0
* | | Merge pull request #491 from arunagw/readme_changesSantiago Pastorino2011-05-115-7/+7
|\ \ \
| * | | Some readme fixes as required. Arun Agrawal2011-05-105-7/+7
* | | | 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
|/ / /