| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | Merge pull request #531 from amatsuda/update_javascripts | José Valim | 2011-05-12 | 1 | -7/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | remove update:javascripts rake task | Akira Matsuda | 2011-05-13 | 1 | -7/+2 | |
| | |/ / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / | The new release supposedly fixed things, but it is still b0rked -- comment ou... | David Heinemeier Hansson | 2011-05-12 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Proper fix | David Heinemeier Hansson | 2011-05-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Fix the assets regexp for non-js/css files | David Heinemeier Hansson | 2011-05-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Merge pull request #527 from joshk/deprecation_circular_dependency | Santiago Pastorino | 2011-05-12 | 1 | -2/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Remove a circular require in AS deprecations. This is safe as AS deprecations... | Josh Kalderimis | 2011-05-12 | 1 | -2/+0 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge pull request #524 from joshk/ar_create_mas_correction | José Valim | 2011-05-12 | 4 | -18/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | updated AR#create! to accept an options hash so the mass-assignment security ... | Josh Kalderimis | 2011-05-12 | 4 | -18/+44 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge pull request #227 from farski/master | Santiago Pastorino | 2011-05-11 | 2 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Removed some redundant Time#change time options from beginning_of_ methods in... | Chris Kalafarski | 2011-03-13 | 2 | -6/+6 | |
| * | | | | | | | | | | | | | Merge pull request #521 from seanmccann/patch-1 | Santiago Pastorino | 2011-05-11 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Remove extra line at end of development config file. | Sean McCann | 2011-05-11 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | Merge pull request #491 from arunagw/readme_changes | Santiago Pastorino | 2011-05-11 | 5 | -7/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Some readme fixes as required. | Arun Agrawal | 2011-05-10 | 5 | -7/+7 | |
| * | | | | | | | | | | | | | | | Depend on master uglifier for now | Santiago Pastorino | 2011-05-11 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations | Jon Leighton | 2011-05-11 | 3 | -6/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Bug fixes: | Fadzril Muhamad & Joseph Palermo | 2011-05-12 | 3 | -6/+18 | |
| * | | | | | | | | | | | | | | | Add missing requires | Santiago Pastorino | 2011-05-11 | 2 | -0/+2 | |
| * | | | | | | | | | | | | | | | Merge pull request #515 from joshk/patch-3 | José Valim | 2011-05-11 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | updated the ActiveSupport changelog | Josh Kalderimis | 2011-05-11 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | Merge pull request #519 from knapo/master | José Valim | 2011-05-11 | 2 | -6/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Fix assigning protected attributes by attributes= | knapo | 2011-05-11 | 2 | -6/+10 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #516 from gucki/master | Xavier Noria | 2011-05-11 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | add missing require for ordered_hash dependency | Corin Langosch | 2011-05-11 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / / / / | Don't remove the target if it has already been destroyed | Andrew White | 2011-05-11 | 2 | -1/+10 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #513 from BlackBulletIV/patch-1 | Xavier Noria | 2011-05-11 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Modified NamedScopeTest to use CollectionAssociation. | Michael Ebens | 2011-05-11 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | Modified CollectionAssociation to refer to the new class name. | Michael Ebens | 2011-05-11 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Don't use select() values from the join model of a through association. Fixes... | Jon Leighton | 2011-05-11 | 5 | -3/+23 | |
| * | | | | | | | | | | | | | | Bring back obj.association_loaded? as a deprecated method. Fixes #472. | Jon Leighton | 2011-05-11 | 2 | -0/+22 | |
| * | | | | | | | | | | | | | | Merge pull request #509 from gucki/master | Jon Leighton | 2011-05-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | fix bug in usage example of #unscoped | Corin Langosch | 2011-05-11 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | 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 | David Lee | 2011-05-10 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | Merge pull request #506 from dlee/custom_csrf_token_tests | José Valim | 2011-05-10 | 2 | -9/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | 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 | 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 | Guillermo Iguaran | 2011-05-10 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Add test to specify that attributes from an association's conditions should b... | Jon Leighton | 2011-05-10 | 4 | -4/+28 | |
| * | | | | | | | | | | | | | | Remove unnecessary '|| {}' | Jon Leighton | 2011-05-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Get around weird missing constant error caused by AS instead of simply raisin... | José Valim | 2011-05-11 | 2 | -26/+37 | |
| * | | | | | | | | | | | | | | Don't use mass-assignment protection when applying the scoped.scope_for_creat... | Jon Leighton | 2011-05-10 | 3 | -3/+16 | |
| * | | | | | | | | | | | | | | 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 | 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 | |
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |