aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5808 from avakhov/assert-template-layout-improveJosé Valim2012-05-043-6/+60
|\
| * Improve assert_template layout checkingAlexey Vakhov2012-05-042-3/+30
| * Fix assert_template :layout => nil assertionAlexey Vakhov2012-05-042-2/+17
| * Fix assert_template assertion with :layout optionAlexey Vakhov2012-05-043-1/+13
|/
* Merge pull request #6160 from carlosantoniodasilva/resource-route-canonical-a...Aaron Patterson2012-05-043-5/+13
|\
| * Force given path to http methods in mapper to skip canonical action checkingCarlos Antonio da Silva2012-05-043-5/+13
* | fix doc [ci skip]Vijay Dev2012-05-041-1/+1
* | session creation methods to a moduleAaron Patterson2012-05-043-24/+11
* | Merge pull request #6154 from shaliko/patch-1Vijay Dev2012-05-041-1/+6
|\ \ | |/ |/|
| * Update documentation for button_to.Shalva Usubov2012-05-041-1/+6
* | update invalid partial error message as per 04202a3f8d66c0675eac41fbf63309f4b...Vijay Dev2012-05-041-4/+4
* | Merge pull request #6159 from marcandre/fix_bad_partial_error_messVijay Dev2012-05-041-2/+2
|\ \
| * | Adjust error message for partial names starting with an uppercase letter.Marc-Andre Lafortune2012-05-041-2/+2
* | | create a request session in the cookie storesAaron Patterson2012-05-041-0/+8
* | | create a request::session object in the memecache store middlewareAaron Patterson2012-05-041-0/+10
|/ /
* | Merge branch 'master' into sessionAaron Patterson2012-05-0467-853/+881
|\|
| * extract deprecated dynamic methodsJon Leighton2012-05-042-142/+40
| * Merge pull request #6153 from carlosantoniodasilva/queue-consumerJosé Valim2012-05-048-23/+89
| |\
| | * Add some docs and changelog entryCarlos Antonio da Silva2012-05-043-13/+21
| | * Allow overriding exception handling in threaded consumerCarlos Antonio da Silva2012-05-042-1/+24
| | * Allow configuring a different queue consumerCarlos Antonio da Silva2012-05-044-9/+44
| * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-0420-377/+150
| |\ \ | | |/ | |/|
| | * Fix ActiveModel README exampleAlexey Vakhov2012-05-041-1/+1
| | * mention database mapping in getting started guideOscar Del Ben2012-05-041-1/+4
| | * Remove vestiges of the http_only! config from configuring guideCarlos Antonio da Silva2012-05-031-8/+0
| | * Update command line guideOscar Del Ben2012-05-031-4/+2
| | * I found it strange that this guide is redirecting questions to a specific per...Paul McMahon2012-05-031-2/+1
| | * Corrected the name of the module that should be included to get the url helpers.Anuj Dutta2012-05-031-1/+1
| | * TypoOscar Del Ben2012-05-021-1/+1
| | * Mention mac os x installation tools on getting started guideOscar Del Ben2012-05-021-1/+4
| | * Remove tags from getting started guide and adapt some of the content toOscar Del Ben2012-05-023-216/+7
| | * Rewrite refactoring section in getting started guideOscar Del Ben2012-05-024-77/+34
| | * Rewrite comments action in getting started guideOscar Del Ben2012-05-023-21/+26
| | * Changed code examples to have a consistent code styling [ci skip]Ayrton De Craene2012-05-021-33/+33
| | * Add note about image_tag('') issue in Asset Pipeline guide (see rails issue #...Michael Pearson2012-05-021-0/+2
| | * Fix example url in text helperAlexey Vakhov2012-05-021-1/+1
| | * Fix form tag with non GET/POST method exampleAlexey Vakhov2012-05-021-1/+1
| | * Documentation fix in options_for_select helper. Fixed display errors caused b...Rodrigo Pavano2012-05-011-9/+26
| | * Add empty rows to improve readability. [ci skip]Edward Tsech2012-05-011-0/+2
| | * Add few lines to describe how aggregation part caching works. [ci skip]Edward Tsech2012-05-011-0/+4
| | * simpler wording and explanationsHrvoje Šimić2012-05-012-11/+11
| | * Lowercase.Ben Pickles2012-05-011-1/+1
| * | Merge pull request #5650 from sekrett/masterVijay Dev2012-05-041-1/+1
| |\ \
| | * | Change the example for habtm association to use proc according to changelogAlexander Zubkov2012-03-291-1/+1
| * | | actually don't need to expand the aggregates at allJon Leighton2012-05-041-11/+1
| * | | #to_sym is unnecessaryJon Leighton2012-05-041-3/+3
| * | | de-globalise methodJon Leighton2012-05-043-9/+6
| * | | extract code from AR::BaseJon Leighton2012-05-043-35/+31
| * | | clean up implementation of dynamic methods. use method compilation etc.Jon Leighton2012-05-048-322/+204
| * | | Merge pull request #6148 from twinturbo/head-fixJosé Valim2012-05-032-1/+87
| |\ \ \