aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adapt "Getting started guide" code sampleOscar Del Ben2012-04-208-129/+36
* Add "Saving data in the controller" sectionOscar Del Ben2012-04-201-0/+27
* Add model creation step to getting started guideOscar Del Ben2012-04-191-6/+27
* Fix broken images linksOscar Del Ben2012-04-191-5/+4
* Add Ruby 1.9.3 recommendationOscar Del Ben2012-04-191-2/+2
* Put warning on getting started guide backOscar Del Ben2012-04-191-1/+3
* Add "Using the change method" title back to make it stand outOscar Del Ben2012-04-191-0/+2
* Regenerate Gemfile for getting started guideOscar Del Ben2012-04-191-3/+3
* Update guide for rails 3.2.3, fix code download link.Oscar Del Ben2012-04-191-5/+4
* Add to guides info how to disable prepared statementsIvan Evtukhovich2012-04-191-0/+7
* Improve observers documentationOscar Del Ben2012-04-181-0/+2
* Fix formattingOscar Del Ben2012-04-181-2/+2
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-1811-27/+63
|\
| * let's keep the slash in the return value instead of the path variable [ci skip]Vijay Dev2012-04-181-2/+2
| * Fix confusing example in ActiveModel::ErrorsThibaut Courouble2012-04-171-2/+2
| * Warn about do end syntax in redirect optionOscar Del Ben2012-04-171-0/+3
| * Fix redirect with block exampleAlexey Vakhov2012-04-171-3/+3
| * Fix example in flash middlewareAlexey Vakhov2012-04-171-1/+1
| * Fix typo where a table name in a join was singular.Don Petersen2012-04-161-1/+1
| * Fixed a typo in migrationsluke2012-04-151-1/+1
| * fix ActiveModel::Validations::Callbacks docJan Xie2012-04-151-1/+2
| * fix bad format [ci skip]Michael de Silva2012-04-141-7/+7
| * Improve example in initializerOscar Del Ben2012-04-141-1/+1
| * SQL query formattingBertrand Chardon2012-04-131-2/+7
| * Fix comment in AD http responseAlexey Vakhov2012-04-131-1/+1
| * Fix HTML sanitizer allowed_css_properties commentAlexey Vakhov2012-04-131-1/+1
| * Revert "Added documentation to explain what happens if you don't set any valu...Rodrigo Flores2012-04-121-5/+2
| * Added documentation to explain what happens if you don't set any values for t...Rodrigo Flores2012-04-121-2/+5
| * Add documentation to detail passing of an object as the secondMichael de Silva2012-04-131-0/+27
| * Fix further typos in ActiveSupport::NotificationsMichael de Silva2012-04-131-4/+4
| * Fix rdoc typo in ActiveSupport::NotificationsMichael de Silva2012-04-131-1/+1
| * Fix typo on the add_index.kennyj2012-04-131-1/+1
* | Revert "Merge pull request #5864 from vatrai/remove_ordered_hash_autoload"Aaron Patterson2012-04-171-0/+1
* | Merge pull request #5871 from rafaelfranca/patch-1José Valim2012-04-171-5/+0
|\ \
| * | Remove unused test code.Rafael Mendonça França2012-04-161-5/+0
* | | Fix testSantiago Pastorino2012-04-161-2/+2
|/ /
* | Merge pull request #5864 from vatrai/remove_ordered_hash_autoloadAaron Patterson2012-04-161-1/+0
|\ \
| * | remove autoload for OrderedHash, usages removed alreadyVishnu Atrai2012-04-161-1/+0
|/ /
* | Merge pull request #5835 from asanghi/masterJeremy Kemper2012-04-161-1/+1
|\ \
| * | Hey, let's just make it easier for everyone and dump the unmaintained ruby-de...Aditya Sanghi2012-04-141-1/+1
* | | Relax multi_json dependency to allow any 1.3 -> 1.x instead of just 1.3.xJeremy Kemper2012-04-161-1/+1
* | | Merge pull request #5863 from rosenfeld/explicit-log-levelJeremy Kemper2012-04-161-2/+2
|\ \ \
| * | | Make log_level explicit in production.rb templateRodrigo Rosenfeld Rosas2012-04-161-2/+2
|/ / /
* | | Merge pull request #5860 from arunagw/multi_json_upgrade_fixPiotr Sarnacki2012-04-162-4/+4
|\ \ \
| * | | fixed broken build after multi_json upgradeArun Agrawal2012-04-162-4/+4
|/ / /
* | | Merge pull request #5856 from arunagw/build_fix_masterPiotr Sarnacki2012-04-162-8/+6
|\ \ \
| * | | fix scaffold_generator_test.rb and model_generator_test.rbArun Agrawal2012-04-162-8/+6
* | | | Merge pull request #5858 from bsodmike/masterVijay Dev2012-04-163-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Update Rails 3.2.3 release date in changelogs as March 30, 2012Michael de Silva2012-04-163-3/+3
|/ / /
* | | opening a connection will block if the pool is fullAaron Patterson2012-04-152-20/+63