aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rename conflicting ActionMailer::MailHelper#simple_format methodMat Brown2011-03-091-2/+2
* The root route example was the only using double quotes; switched it to singl...Chris Kalafarski2011-03-081-1/+1
* Add better test scenario for around callback return resultsAaron Pfeifer2011-03-081-0/+10
* Allow access to a callback event's return result from around callbacksAaron Pfeifer2011-03-082-2/+32
* removing stubs. 1.9.3 implements Date.today in C so mocking the return value ...Aaron Patterson2011-03-071-9/+4
* fixing some tests on ruby 1.9.3Aaron Patterson2011-03-071-0/+23
* reorganizes the RDoc of Hash#to_paramXavier Noria2011-03-071-6/+14
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-0729-87/+79
|\
| * formatting changesVijay Dev2011-03-072-15/+14
| * Improved docs for Hash#to_param methodDalibor Nasevic2011-03-061-3/+2
| * Configuration options are symbolsPaco Guzman2011-03-061-2/+2
| * Remove Example headers. Code just flows with the text. 6ce844a3Paco Guzman2011-03-063-8/+2
| * more "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-0718-52/+52
| * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-074-4/+4
| * s/a/an/Akira Matsuda2011-03-071-1/+1
| * fix typosAkira Matsuda2011-03-071-2/+2
* | do not test explicit equality of predicate methods, they should be allowed to...Aaron Patterson2011-03-072-8/+4
* | refactor calls to to_param in expand_key methodAaron Patterson2011-03-071-9/+10
* | Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-072-1/+27
* | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-0723-27/+179
|\ \
| * \ Merge branch 'active_model_unused_variable' of https://github.com/pacoguzman/...Xavier Noria2011-03-071-1/+1
| |\ \
| | * | remove unused assigned variablePaco Guzman2011-03-061-1/+1
| | |/
| * / Fixed indentation in actionmailer base_test [#6538 state:committed]Dalibor Nasevic2011-03-071-2/+2
| |/
| * removes merge conflictsXavier Noria2011-03-062-15/+0
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-0612-15/+47
| |\
| | * removes Examples headers introduced in 9b96de6Xavier Noria2011-03-061-10/+4
| | * Revert "Fixed identation in actionmailer base_test"Xavier Noria2011-03-061-2/+2
| | * more style changessuchasurge2011-03-062-2/+2
| | * Some style changessuchasurge2011-03-065-5/+11
| | * style changesJudeArasu2011-03-061-3/+5
| | * Revert "style changes"JudeArasu2011-03-061-3/+3
| | * style changesJudeArasu2011-03-061-3/+3
| | * styles applied for usageJudeArasu2011-03-061-3/+4
| | * Fixed identation in actionmailer base_testDalibor Nasevic2011-03-061-2/+2
| | * wrong SQL statementAkira Matsuda2011-03-061-1/+1
| | * merges railsXavier Noria2011-03-0598-1334/+2114
| | |\
| | * | commas to set off expressions that interrupt sentence flowJudeArasu2011-03-051-1/+1
| | * | typo changesJudeArasu2011-03-051-1/+1
| | * | typo changesJudeArasu2011-03-051-1/+2
| | * | Railties typos.R.T. Lechow2011-03-044-6/+6
| | * | Action Pack typos.R.T. Lechow2011-03-0411-15/+15
| | * | Active Record typos.R.T. Lechow2011-03-046-10/+10
| | * | Active Support typos.R.T. Lechow2011-03-047-7/+7
| | * | Active Resource typos.R.T. Lechow2011-03-045-6/+6
| | * | Active Model typos.R.T. Lechow2011-03-042-2/+2
| | * | Merge remote branch 'origin/master'Jonathon D. Jones2011-03-031-1/+1
| | |\ \
| | | * | Properly escaped a + in the dynamic segments TIPtashian2011-03-031-1/+1
| | * | | Adds link to Object.blank? from Object.present?Jonathon D. Jones2011-03-031-1/+1
| | |/ /
| | * | fixes a missmatched column in examplemjy2011-03-031-1/+1
| | * | Spelling mistakeJudeArasu2011-03-031-1/+2