aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
* | | adds test coverage to ensure DateTime#advance processes first the date deltas...Xavier Noria2010-08-051-12/+19
* | | Merge remote branch 'docrails/master'Xavier Noria2010-08-053-14/+45
|\| |
| * | AS guide: documents DateTime#advanceXavier Noria2010-08-051-3/+34
| * | Fix ActiveSupport::Callbacks' define_callbacks and ActiveSupport::Concern doc...Tom Stuart2010-08-052-11/+11
* | | avoid passing lists of lists to the group clauseAaron Patterson2010-08-041-1/+1
* | | Merge remote branch 'docrails/master'Xavier Noria2010-08-0517-46/+85
|\| |
| * | standarizes the use of the article "an" for "SQL" and "SQLite"Xavier Noria2010-08-0510-11/+11
| * | adding documentation to ActiveSupport::Concern ht:strictly typed for an aweso...Neeraj Singh2010-08-043-1/+40
| * | Fixed Railtie Rdoc examples not properly formatted [#4918 state:resolved]Simone Carletti2010-08-041-21/+21
| * | removed duplicate wordMark Hayes2010-08-031-1/+1
| * | fixing documentationNeeraj Singh2010-08-034-14/+14
* | | call to_a since we are not passing anything to all()Aaron Patterson2010-08-041-1/+1
* | | fisting indentationAaron Patterson2010-08-041-3/+3
* | | Reload action_methods in AbstractController after defining new method.Piotr Sarnacki2010-08-044-1/+42
* | | Revert "If a file is in the load path, require it without its full path (in m...José Valim2010-08-041-7/+2
* | | do not pass AR objects to ARelAaron Patterson2010-08-041-0/+2
* | | Revert "Put lib back on the autoload path"José Valim2010-08-041-1/+1
* | | I'm unsure how cloning was working in Rails 3 beforewycats2010-08-041-1/+1
* | | Concernify SanitizeHelper and TextHelper so including TextHelper correctly in...wycats2010-08-042-0/+4
* | | If a file is in the load path, require it without its full path (in more places)wycats2010-08-041-2/+7
* | | require_dependency should require using the normal mechanism if possible to a...wycats2010-08-041-7/+15
* | | avoid passing AR::Base objects to Arel when we canAaron Patterson2010-08-031-0/+2
* | | query value is converted to_s instead of to_yamlRainerBlessing2010-08-032-1/+9