aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* changelog fixes. Closes #3911Vijay Dev2012-05-011-13/+0
* more edits [ci skip]Vijay Dev2012-05-012-2/+2
* copy edit AS deprecation/behaviours docs [ci skip]Vijay Dev2012-05-011-22/+11
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-0130-494/+167
|\
| * Revert "Added Short 1 line note about connection pools. "Vijay Dev2012-05-011-2/+0
| * Merge pull request #95 from RobZolkos/add_doc_for_utc_offsetVijay Dev2012-05-011-0/+1
| |\
| | * Add documention for utc_offset methodRob Zolkos2012-05-011-0/+1
| * | Add line which gives a little bit more information how *_will_change! works.Edward Tsech2012-05-011-0/+1
| |/
| * Bump Rails version in action mailer guide.Oscar Del Ben2012-05-011-1/+1
| * Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-05-013-10/+13
| |\
| | * Minor English fix.Erich Menge2012-04-301-1/+1
| | * Added Short 1 line note about connection pools. Gaurish Sharma2012-04-301-0/+2
| | * add ActiveRecord::RecordInvalid to exceptionsHrvoje Šimić2012-04-301-9/+10
| * | Getting Started Guide Code CleanupOscar Del Ben2012-05-012-10/+1
| |/
| * Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-301-0/+4
| |\
| | * Rails 4.0 upgrade note for the ConfirmationValidator changeBrian Cardarella2012-04-301-0/+4
| * | Rewrite adding a second model section of Getting Started GuideOscar Del Ben2012-04-304-39/+42
| |/
| * Fix stray capitalizationMark Rushakoff2012-04-291-1/+1
| * Fix rdoc formatting in Mime::TypeMark Rushakoff2012-04-291-5/+5
| * Reword polymorphic routes + mounted engine rdocMark Rushakoff2012-04-291-8/+6
| * Remove scaffold explanation from getting started guideOscar Del Ben2012-04-291-410/+11
| * Merge branch 'master' of github.com:lifo/docrailstwinturbo2012-04-291-0/+1
| |\
| | * Fix 'Can't mass-assign protected attributes: tags_attributes' in Rails 3.2.3.Kevin Richardson2012-04-291-0/+1
| | * Revert "Make non English title indexable (such as Chinese or Japanese) using ...Tony Jian2012-04-291-3/+2
| | * Make non English title indexable (such as Chinese or Japanese) using MD5.Tony Jian2012-04-291-2/+3
| * | Document ActiveSupport::Deprecations.behaviortwinturbo2012-04-291-1/+19
| |/
| * Merge branch 'master' of github.com:lifo/docrailstwinturbo2012-04-28426-5055/+6391
| |\
| | * fix typo in ActiveSupport::Inflector#titleizeFrancesco Rodriguez2012-04-281-1/+1
| | * Fix misptintAlexey Vakhov2012-04-281-1/+1
| | * Remove unnecessary ).Uģis Ozols2012-04-281-1/+1
| | * Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-28124-2556/+2044
| | |\
| | | * Correct small consistency issue in AR querying guideMatthias Schmidt2012-04-281-1/+1
| | | * Code-format references to config settingsMark Rushakoff2012-04-277-7/+7
| | | * Update guides - run single test for AR testingAlexey Vakhov2012-04-281-0/+6
| | | * Update contributing guide - run single testAlexey Vakhov2012-04-281-0/+7
| | | * Update AM exampleAlexey Vakhov2012-04-281-3/+3
| | | * More using <tt>x</tt> instead of +x+ when the latter renders improperly.Mark Rushakoff2012-04-273-4/+4
| | * | Add REST section to getting started guideOscar Del Ben2012-04-282-10/+50
| * | | Document exception handling inside resce_from handlerstwinturbo2012-04-281-0/+1
* | | | Merge pull request #2532 from hasclass/as_json__encode_infinite_and_nan_float...Piotr Sarnacki2012-04-302-0/+7
|\ \ \ \
| * | | | JSON: Encode infinite or NaN floats as null to generate valid JSON.Sebi Burkhard2011-08-152-0/+7
* | | | | Merge pull request #6093 from marcandre/observer_publicJeremy Kemper2012-04-302-21/+27
|\ \ \ \ \
| * | | | | notify_observers should be publicMarc-Andre Lafortune2012-04-302-21/+27
|/ / / / /
* | | | | Merge pull request #6063 from marcandre/observer_extra_argsAaron Patterson2012-04-302-11/+26
|\ \ \ \ \
| * | | | | Allow extra arguments for ObserversMarc-Andre Lafortune2012-04-302-11/+26
* | | | | | remove useless assertionsAaron Patterson2012-04-301-10/+3
* | | | | | return value of block is returnedAaron Patterson2012-04-302-3/+14
* | | | | | only yield to finder block if something is foundAaron Patterson2012-04-302-1/+11
* | | | | | Fix PR #6091Andrew White2012-04-302-2/+2
* | | | | | Merge pull request #5181 from mcmire/issue_3560Jeremy Kemper2012-04-302-20/+37
|\ \ \ \ \ \