aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* RouteSet: remove some code dupsBogdan Gusiev2012-05-021-19/+10
* ActionPack routes: remove some useless code.Bogdan Gusiev2012-05-021-26/+4
* Merge pull request #6120 from arunagw/build_fix_master_railtiesJosé Valim2012-05-022-3/+3
|\
| * Fix build for railties generators Arun Agrawal2012-05-022-3/+3
|/
* Merge pull request #6118 from arunagw/build_fix_masterJosé Valim2012-05-021-2/+2
|\
| * build fix for SharedGeneratorTestsArun Agrawal2012-05-021-2/+2
|/
* Merge pull request #6040 from Paymium/issue-6033José Valim2012-05-023-1/+28
|\
| * BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ...David FRANCOIS2012-05-023-1/+28
* | Merge pull request #5962 from bogdan/routesJosé Valim2012-05-021-18/+0
|\ \
| * | ActionPack: remove tests for hash_for_* methodsBogdan Gusiev2012-05-021-18/+0
| |/
* | Merge pull request #6111 from oscardelben/new_hash_syntax_in_gemfileJosé Valim2012-05-021-14/+14
|\ \ | |/ |/|
| * Use new hash syntax in generated GemfileOscar Del Ben2012-05-021-14/+14
|/
* Merge pull request #6109 from carlosantoniodasilva/fix-buildSantiago Pastorino2012-05-011-2/+2
|\
| * Build fix for plugin new generator changeCarlos Antonio da Silva2012-05-011-2/+2
|/
* Merge pull request #4345 from sunaku/patch-1Santiago Pastorino2012-05-011-1/+1
|\
| * gemspec assumes that user kept all generated files Suraj N. Kurapati2012-01-061-1/+1
* | Fix testsPiotr Sarnacki2012-05-011-1/+1
* | Use :github option in Gemfile and make hashes consistentPiotr Sarnacki2012-05-012-17/+17
* | Merge pull request #6102 from rodrei/remove_unused_varsJosé Valim2012-05-011-2/+0
|\ \
| * | Removing unused local vars in Queue testsRodrigo Pavano2012-05-011-2/+0
* | | copy-edit guide [ci skip]Vijay Dev2012-05-021-2/+1
* | | remove unused pguides rake task from railtiesVijay Dev2012-05-021-9/+0
* | | Merge pull request #6096 from hasclass/as_json__encode_infinite_and_nan_bigde...Piotr Sarnacki2012-05-012-1/+4
|\ \ \
| * | | JSON: encode BigDecimal NaN/Infinity as null.Sebi Burkhard2012-05-012-1/+4
* | | | Merge pull request #6089 from frodsan/delete_all_limitAaron Patterson2012-05-012-0/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | delete_all raise an error if a limit is provided - fixes #4979Francesco Rodriguez2012-04-302-0/+6
* | | | Merge pull request #6092 from jsanders/issue_4001_error_typecasting_non_integ...Aaron Patterson2012-05-012-1/+25
|\ \ \ \
| * | | | Don't type cast values that don't respond to to_i to 1James Sanders & Jason Noble2012-04-302-1/+25
* | | | | 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
| |\ \ \ \