aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of http://github.com/rails/railsGonçalo Silva2010-08-10446-10545/+10118
|\
| * Revert "require_dependency should require using the normal mechanism if possi...José Valim2010-08-101-15/+7
| * fixes a typo reported by rymaiXavier Noria2010-08-101-1/+1
| * AS guide: removes some duplication, and makes a second pass on method delegationXavier Noria2010-08-101-144/+21
| * adds the AS guide to the guides indexXavier Noria2010-08-103-0/+6
| * AS guide: documents Module#redefine_methodXavier Noria2010-08-101-0/+21
| * AS guide: documents Module#(instance_)method_namesXavier Noria2010-08-101-0/+12
| * Added test case to verify that transaction callbacks are correctly propagated...Tobias Lütke2010-08-091-0/+41
| * AS guide: documents Module#delegateXavier Noria2010-08-101-0/+82
| * AS guide: documents Process.daemonXavier Noria2010-08-101-1/+3
| * AS guide: documents date/datetime/time arithmetic with durationsXavier Noria2010-08-101-1/+62
| * Merge remote branch 'brianmario/mysql2'Jeremy Kemper2010-08-0920-36/+1110
| |\
| | * move mysql2 adapter into coreBrian Lopez2010-08-091-0/+639
| | * ignore this test for mysql2Brian Lopez2010-08-091-13/+15
| | * bringing over latest from masterBrian Lopez2010-08-0997-1283/+2061
| | |\ | | |/ | |/|
| * | rename _snowman to _ewycats2010-08-093-3/+3
| * | Improve best_standards_support to use only IE=Edge in development modewycats2010-08-094-34/+81
| * | adds missing requires for Object#tryXavier Noria2010-08-097-1/+12
| * | form helpers guide: fixes an exampleXavier Noria2010-08-091-1/+1
| * | adds URL to the body generated by the redirect macro in the routes mapper as ...Xavier Noria2010-08-092-31/+29
| * | AC guide: commit review, block examples go at column 0, use .example.com as e...Xavier Noria2010-08-091-15/+15
| * | typo in AMAdam Meehan2010-08-091-1/+1
| * | updated the action_controller guide with the new session configuration optionsDaniel McNevin2010-08-081-13/+28
| * | Merge remote branch 'rails/master'Xavier Noria2010-08-087-9/+65
| |\ \
| | * \ Merge remote branch 'docrails/master'Xavier Noria2010-08-082-9/+6
| | |\ \
| | * | | routing guide: documents the CONTROLLER environment variable understood by th...Xavier Noria2010-08-081-0/+6
| | * | | updates horo dependency to 1.0.1Xavier Noria2010-08-081-1/+1
| | * | | undoes one of the modifications to RDoc::Parser.binary?Xavier Noria2010-08-071-1/+1
| | * | | quick hack: hijacks the predicate RDoc::Parser.binary? so that it does not co...Xavier Noria2010-08-071-0/+27
| | * | | adds Abstract Controller to the APIXavier Noria2010-08-071-0/+1
| | * | | reduce the number of times current_connection_id is called in with_connection()Aaron Patterson2010-08-061-4/+5
| | * | | test to ensure that respond_to? delegates to arelAaron Patterson2010-08-061-0/+19
| | * | | sorry AR, my privates are none of your businessAaron Patterson2010-08-061-7/+0
| | * | | do not rely on arel class structureAaron Patterson2010-08-062-1/+10
| * | | | fix reference to time/calculations.rb in AS guideXavier Noria2010-08-061-1/+1
| | |/ / | |/| |
| * | | correcting wrong exampleNeeraj Singh2010-08-061-1/+1
| * | | updating documentation for method configure_dependency_for_has_manyNeeraj Singh2010-08-061-8/+5
| |/ /
| * | AS guide: documents calculations with Time objectsXavier Noria2010-08-061-13/+99
| * | edit pass to AMo::Serializers::JSONXavier Noria2010-08-061-9/+9
| * | AR guide: fixes a queryXavier Noria2010-08-061-1/+1
| * | commit review: say clearly that AS::OrderedHash is about insertion order, be ...Xavier Noria2010-08-062-12/+14
| * | adding documentation for OrderedHash and OrderedOptionsNeeraj Singh2010-08-062-1/+24
| * | adding an example of skipping a callbackNeeraj Singh2010-08-061-1/+5
| * | Merge remote branch 'docrails/master'Xavier Noria2010-08-052-1/+24
| |\ \
| | * | documents that :terminator is a string to be eval'ed, and that it sees the re...Xavier Noria2010-08-051-1/+2
| | * | Revert "correcting the documentation that default to false. it does not defau...Xavier Noria2010-08-051-4/+5
| | * | fixing typoNeeraj Singh2010-08-051-1/+1
| | * | more documentation for class_inheritable_*Neeraj Singh2010-08-051-0/+22
| | * | correcting the documentation that default to false. it does not default to fa...Neeraj Singh2010-08-051-5/+4
| * | | fixing whitespace errorsAaron Patterson2010-08-052-10/+10