aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Fix models load order to be able to run unit tests.Emilio Tagua2009-04-234-13/+13
| * | Minor editsPratik Naik2009-04-301-2/+2
| * | Tweak to credits.Mike Gunderloy2009-04-291-1/+1
| * | More templatesPratik Naik2009-04-291-6/+226
| * | changed sentenceDallas Taylor2009-04-281-1/+1
| * | Missing tiny quoteSunny Ripert2009-04-281-1/+1
| * | fixes redirect codes in layouts and rendering guide, thanks to Loren NormanXavier Noria2009-04-281-1/+1
* | | Formatting fixesAditya Chadha2009-05-021-13/+25
|/ /
* | Merge branch 'master' of git@github.com:lifo/docrailsAditya Chadha2009-04-276-77/+91
|\ \
| * | Removed reference in documentation of form_authenticity_token to deprecated :...Luke Amdor2009-04-271-2/+1
| * | fixes an example from the previous commitXavier Noria2009-04-271-2/+2
| * | adds timestamps in examples of generated asset paths, and documents this bit ...Xavier Noria2009-04-271-69/+72
| * | Merge branch 'master' of git://github.com/lifo/docrailsDallas Taylor2009-04-273-5/+18
| |\ \
| | * | Made a minor syntax correction.Sean Schofield2009-04-271-1/+1
| | * | Add documentation for respond_to's any methodRyan Bigg2009-04-271-0/+12
| | * | bring index actions back in caching guide, REST conventions are encouraged an...Xavier Noria2009-04-271-4/+4
| * | | fixed typo and clarified sentenceDallas Taylor2009-04-271-1/+1
* | | | Formatting updates per lifoAditya Chadha2009-04-271-12/+10
| |/ / |/| |
* | | Fix typos in submitted patchAditya Chadha2009-04-261-8/+9
|/ /
* | Minor changes to scaffold code, addition of dependent destroy example.Dana Jones2009-04-251-14/+28
* | Better wording of environment.rb example code, thanks Paul GillardKarel Minarik2009-04-251-1/+1
* | Consolidate `config/locale` vs `config/locales` issue. [#16213]Karel Minarik2009-04-251-5/+5
* | Merge commit 'mainstream/master'Pratik Naik2009-04-23124-398/+696
|\|
| * * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-2332-239/+384
| * Removed rest of Symbol#to_proc from railties testsJeremy Kemper2009-04-222-3/+3
| * Missed oneJeremy Kemper2009-04-221-1/+1
| * Remove Symbol#to_proc dependencyJeremy Kemper2009-04-221-2/+2
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2226-114/+165
| |\
| | * Refactor ActionView::PathYehuda Katz + Carl Lerche2009-04-2226-114/+165
| * | Fix dependencies revealed by testing in isolationJeremy Kemper2009-04-2261-32/+127
| * | new_callbacks core extensionsJeremy Kemper2009-04-222-5/+8
| |/
| * Fix tests on 1.9Jeremy Kemper2009-04-224-2/+6
* | String interpolation conditionsPratik Naik2009-04-231-0/+11
* | Merge commit 'mainstream/master'Pratik Naik2009-04-23220-4046/+3985
|\|
| * Merge branch 'master' into cherryJeremy Kemper2009-04-225-1/+7
| |\
| | * Opt in to JSONJeremy Kemper2009-04-225-1/+7
| * | Opt in to DependenciesJeremy Kemper2009-04-2210-10/+19
| |/
| * No more free lunchJeremy Kemper2009-04-2214-21/+38
| * stdlib autoloads were hanging on 1.9.1Jeremy Kemper2009-04-223-9/+6
| * Get Active Model in the mixJeremy Kemper2009-04-221-1/+1
| * Divert CoreExtensions mention in docsJeremy Kemper2009-04-221-1/+1
| * Convert string extension modules to class reopensJeremy Kemper2009-04-226-291/+247
| * ActiveSupport.core_ext bridge util no longer usedJeremy Kemper2009-04-221-10/+0
| * Switch last module core extension to class reopenJeremy Kemper2009-04-222-21/+6
| * Merge branch 'master' into cherryJeremy Kemper2009-04-226-18/+96
| |\
| | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-224-16/+80
| | |\
| | | * Fix test_rescue_routing_exceptions when running with rakeJoshua Peek2009-04-211-13/+15
| | | * refactor some coupled rescue testsJoshua Peek2009-04-211-16/+78
| | | * Session tests belong under dispatch folderJoshua Peek2009-04-213-0/+0
| | * | Rack::Utils.body_to_s doesn't exist in 1.0Jeremy Kemper2009-04-222-2/+16
| | |/