aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [docs] make it clear that the methods in a generator are executed sequentiallyBrian Browning2011-12-231-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-245-22/+27
|\
| * AM::MAS.attr_protected: rework usage example.Bogdan Gusiev2011-12-231-9/+9
| * Added link in MIT license for Action Mailer README. I think this seems approp...Kristian Freeman2011-12-221-1/+3
| * Added link to MIT license. Would love commentary on whether this seems approp...Kristian Freeman2011-12-221-1/+3
| * Readability in Action Mailer README.Kristian Freeman2011-12-221-3/+3
| * Correct grammar on Mailer generator -- passES. Working on enhancing conventio...Kristian Freeman2011-12-221-1/+1
| * [docs] pluck docs reverted for activesupportArun Agrawal2011-12-231-10/+0
| * Fixed AM::MasAsSec.attr_protected usage example. Bogdan Gusiev2011-12-221-15/+16
| * Fix AM::MassAssignementSecurity docBogdan Gusiev2011-12-221-1/+1
| * [docs] Added missing "}" fixes #4126Arun Agrawal2011-12-221-1/+1
* | Rails 3.2 Release NotesVijay Dev2011-12-241-0/+429
* | Doh, remove debugging lineJon Leighton2011-12-231-1/+0
* | Fix #4046.Jon Leighton2011-12-235-46/+58
* | serialize fails on subclassAlvaro Bautista2011-12-234-6/+32
* | removes Enumerable#pluck from the AS guideXavier Noria2011-12-231-10/+0
* | Merge pull request #4140 from kuroda/databases_rakeAaron Patterson2011-12-221-0/+1
|\ \
| * | Reconnect to the first database after db:createTsutomu Kuroda2011-12-231-0/+1
* | | Merge pull request #4142 from lest/remove-1-8-codeJosé Valim2011-12-221-21/+0
|\ \ \ | |/ / |/| |
| * | remove Enumerable#each_with_object againSergey Nartimov2011-12-231-21/+0
|/ /
* | adding an integration test for splat regexp substitutions. fixes #4138Aaron Patterson2011-12-221-0/+13
* | Adding an integration test. Fixes #4136Aaron Patterson2011-12-221-0/+9
* | Fix build when IM=trueJon Leighton2011-12-221-4/+3
* | Delete unnecessary line that was necessary before I changed the code and it b...Jon Leighton2011-12-221-1/+0
* | adds deprecation warnings to the RDoc of Array#uniq_by(!)Xavier Noria2011-12-201-2/+6
* | removes some unnecessary selfsXavier Noria2011-12-201-3/+3
* | rack bodies should be a listAaron Patterson2011-12-221-7/+7
* | refactoring routing testsAaron Patterson2011-12-221-34/+19
* | Remove 1.8 backportJon Leighton2011-12-221-9/+0
* | remove conflict markerVijay Dev2011-12-231-1/+0
* | Make ActiveRecord::Relation#pluck work with serialized attributesJon Leighton2011-12-222-5/+12
* | Make read_attribute code path accessible at the class levelJon Leighton2011-12-225-56/+48
* | Revert "Added Enumerable#pluck to wrap the common pattern of collect(&:method...Aaron Patterson2011-12-223-14/+20
* | Depend on 4.0.0.beta gems. Use https for github urls.Jeremy Kemper2011-12-222-11/+11
* | Merge pull request #4135 from nashby/deprecate-uniq-byJosé Valim2011-12-222-12/+22
|\ \
| * | deprecate Array#uniq_by and Array#uniq_by! in favor of Array#uniq and Array#u...Vasiliy Ermolovich2011-12-222-12/+22
* | | Merge pull request #4133 from lest/remove-1-8-codeJosé Valim2011-12-224-13/+0
|\ \ \
| * | | no more need to make Time#to_date and Time#to_datetime publicSergey Nartimov2011-12-224-13/+0
| |/ /
* | | Revert "Merge pull request #4114 from alexeymuranov/my_fix_for_prefix_suffix_...Jon Leighton2011-12-222-78/+23
* | | Merge pull request #4114 from alexeymuranov/my_fix_for_prefix_suffix_fixtures...Jon Leighton2011-12-222-23/+78
|\ \ \ | |/ / |/| |
| * | Fix a fixtures test case with table prefix/suffixAlexey Muranov2011-12-222-23/+78
* | | Update activesupport/lib/active_support.rbJosé Valim2011-12-221-1/+1
* | | Merge pull request #4121 from lest/remove-whiny-nilsJosé Valim2011-12-216-46/+6
|\ \ \
| * | | remove AS whiny nil extension and deprecate config.whiny_nilsSergey Nartimov2011-12-226-46/+6
|/ / /
* | | Merge pull request #4125 from nashby/remove-process-daemonJosé Valim2011-12-214-32/+0
|\ \ \
| * | | remove Proces.daemon from core_extVasiliy Ermolovich2011-12-224-32/+0
|/ / /
* | | just require things onceAaron Patterson2011-12-211-4/+2
* | | append puts the routes after the default, which causes a 404. instead use pre...Aaron Patterson2011-12-211-1/+1
* | | just use def setupAaron Patterson2011-12-211-1/+2
* | | DeprecatedUnderscoreRead does not exist anymoreAaron Patterson2011-12-211-1/+0