aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-1226-89/+120
|\
| * copy edits [ci skip]Vijay Dev2013-05-121-5/+1
| * ruby -> RubyPrathamesh Sonpatki2013-05-123-3/+3
| * added docs for InheritedOptions class [ci skip]Anton Kalyaev2013-05-111-0/+8
| * Fixed boolean validation example to use inclusion instead of presence on migr...Dana Jones2013-05-101-2/+3
| * RDoc style for ActionMailer::Base#mailZachary Scott2013-05-101-23/+25
| * Document ActionMailer::Base::default, ::mailer_name, and #mailer_nameZachary Scott2013-05-101-14/+25
| * Added documentation for ActiveRecord::Generators::MigrationGenerator.next_mig...aditya-kapoor2013-05-101-0/+4
| * Added documentation for ActiveRecord::Base#next_migration_numberaditya-kapoor2013-05-091-0/+5
| * changed rails -> Rails at two placesaditya-kapoor2013-05-092-2/+2
| * minor rdoc cleanup for reflection methodsNeeraj Singh2013-05-091-4/+4
| * Fix Typo xml -> XML, json -> JSONPrathamesh Sonpatki2013-05-081-2/+2
| * Changed spelling of Busines to Businessaditya-kapoor2013-05-081-1/+1
| * according to @fxn it's ERB not ERb.Yves Senn2013-05-071-2/+1
| * XML-files isn't a wordWaynn Lue2013-05-061-1/+1
| * Fix grammar on AM.mailer_name documentation.Hendy Tanata2013-05-061-1/+1
| * Improve model generator USAGE grammarMatthew Michihara2013-05-051-5/+5
| * 2.15.1 is the first release that supports Rails 4.Sam Ruby2013-05-051-1/+1
| * dir -> directoryPrathamesh Sonpatki2013-05-042-2/+2
| * Changing the wordings in a few placesAkshay Khole2013-05-041-2/+2
| * comments in the callbacks description are in present tenseAkshay Khole2013-05-041-3/+3
| * Update CreateComments migration to reflect the output from Rails 4.Douglas Teoh2013-05-041-9/+5
| * Fix another incorrect post_path link generation.Douglas Teoh2013-05-041-1/+1
| * Remove unopened closing brace.Douglas Teoh2013-05-041-2/+1
| * Fix incorrect post_path link generation.Douglas Teoh2013-05-041-1/+1
| * Add some documentation for AM.mailer_namePrem Sichanugrist2013-05-031-0/+2
| * replace apostrophe with backquote for matching [ci skip]Anton Kalyaev2013-05-031-2/+2
| * Capitalizing internet to Internet. [ci skip]Akshay Khole2013-05-032-2/+2
| * added to rdoc for unscope that default_scope winsNeeraj Singh2013-05-031-0/+3
| * Simple grammar updatesJonathan Roes2013-05-031-2/+2
| * fix typoVipul A M2013-05-021-1/+1
| * document String#to_time exceptionVipul A M2013-05-021-0/+1
| * Clean up the wording in a few placesJonathan Roes2013-05-011-4/+4
| * Add a few overview bullet pointsJonathan Roes2013-05-011-0/+4
| * Fix typo "can exploited" with "can be exploited"Leo Gallucci2013-05-011-1/+1
| * Rails 4 has deprecated :order in has_many to use a lambda instead, update the...Nick Quaranto2013-05-011-1/+1
* | Merge pull request #10576 from sferik/remove_multi_json_dependencyYehuda Katz2013-05-114-46/+19
|\ \
| * | Replace multi_json with jsonErik Michaels-Ober2013-05-114-46/+19
|/ /
* | Merge pull request #10574 from wangjohn/automatic_inverse_of_documentationRafael Mendonça França2013-05-113-1/+33
|\ \
| * | Adding documentation to the automatic inverse_of finder.wangjohn2013-05-113-1/+33
|/ /
* | Improve CHANGELOG entry [ci kip]Rafael Mendonça França2013-05-111-6/+10
* | Merge pull request #10503 from kstevens715/masterRafael Mendonça França2013-05-113-1/+32
|\ \
| * | Call assume_migrated_upto_version on connectionKyle Stevens2013-05-113-1/+32
|/ /
* | Merge pull request #10567 from neerajdotname/read_attribute_before_type_cast_...Rafael Mendonça França2013-05-113-1/+7
|\ \
| * | read_attribute_before_type_cast should accept symbolNeeraj Singh2013-05-113-1/+7
* | | Merge pull request #10572 from nertzy/dont-modify-options-hash-in-primary-keyRafael Mendonça França2013-05-111-2/+1
* | | Merge pull request #10568 from siong1987/minor-refactoringXavier Noria2013-05-111-5/+0
|\ \ \ | |/ / |/| |
| * | Clean up unused method for `rake doc`.Teng Siong Ong2013-05-111-5/+0
|/ /
* | Merge branch 'fix-json-encoding'Rafael Mendonça França2013-05-103-5/+18
|\ \
| * | Give credits to all the envolved people [ci skip]Rafael Mendonça França2013-05-101-1/+1