aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | update syntax and add note about prompt use of HttpHelpers [ci-skip]Cesar Carruitero2012-11-091-12/+17
| * | correct link syntax [ci-skip]Cesar Carruitero2012-11-091-5/+5
| * | change rdoc syntax for adecuate render [ci-skip]Cesar Carruitero2012-11-091-1/+1
| * | Further explain the CDN and caching situation.Steve Klabnik2012-11-091-3/+4
| * | Add note about asset pipeline and CDNs.Steve Klabnik2012-11-091-0/+11
| * | Fix default cache store documentation.Steve Klabnik2012-11-091-2/+2
| * | correct double quotes for interpolation in routing guide [ci_skip]Cesar Carruitero2012-11-081-2/+2
| * | change match to get and add single quotes in routing/redirection [ci-skip]Cesar Carruitero2012-11-081-8/+8
| * | Action mailer can take an array for template_dirMalcolm Locke2012-11-091-1/+1
| * | 1.9 hash syntax changesAvnerCohen2012-11-087-111/+111
| * | fix bugs in rails_on_rack [ci-skip]Cesar Carruitero2012-11-081-2/+2
| * | make syntax of select.map(&:field) same as pluckGaurish Sharma2012-11-081-0/+2
| * | Actionmailer to 1.9 hash syntaxAvnerCohen2012-11-081-9/+9
| * | update syntax in routing guide [ci-skip]Cesar Carruitero2012-11-081-64/+64
| * | Hash Syntax to 1.9 converisonAvnerCohen2012-11-071-3/+3
| * | Revert "fix white spaces"Carlos Antonio da Silva2012-11-051-2/+2
| * | fix white spacesCesar Carruitero2012-11-051-2/+2
| * | Fixed the wrong terminology usage in 2.2.2comptrol2012-11-031-1/+1
* | | Add UpgradeSignatureToEncryptionCookieStoreSantiago Pastorino2012-11-165-7/+143
* | | Call get_cookie to allow the method to be overriden by subclassesSantiago Pastorino2012-11-161-1/+1
* | | Add missing env param to get_cookieSantiago Pastorino2012-11-161-1/+1
* | | Remove duplicated get /foo/write_sessionSantiago Pastorino2012-11-161-1/+0
* | | Remove unused config optionSantiago Pastorino2012-11-161-1/+0
* | | Merge pull request #8234 from kentaro/bundler-1.2.2Rafael Mendonça França2012-11-161-1/+1
|\ \ \
| * | | Depend bundler from `=> 1.2.2` to `< 2.0`Kentaro Kuribayashi2012-11-161-1/+1
| * | | Updated dependency for bundler to ~> 1.2.2Kentaro Kuribayashi2012-11-161-1/+1
* | | | Move changelog entry from #8235 to the top [ci skip]Carlos Antonio da Silva2012-11-161-7/+7
* | | | Remove config.threadsafe! from production env templateCarlos Antonio da Silva2012-11-161-3/+0
* | | | Refactor url methods a bitCarlos Antonio da Silva2012-11-161-9/+9
* | | | Fix failing template testsCarlos Antonio da Silva2012-11-161-2/+2
* | | | Merge pull request #8236 from marcandre/use_divXavier Noria2012-11-162-4/+12
|\ \ \ \
| * | | | Simplify (and optimize)Marc-Andre Lafortune2012-11-161-3/+3
| * | | | Use Integer#div instead of Integer#/ to avoid side effects from mathnMarc-Andre Lafortune2012-11-162-1/+9
| |/ / /
* | | | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintextJosé Valim2012-11-163-1/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`.Joost Baaij2012-11-163-1/+27
|/ / /
* | | Remove extra whitespaceSantiago Pastorino2012-11-151-1/+1
* | | Add docs for CachingKeyGeneratorSantiago Pastorino2012-11-151-0/+6
* | | Add nodoc to DummyKeyGenerator since it's a private thingSantiago Pastorino2012-11-151-1/+1
* | | arel columns can be used for grouping so that "weird" column names are usableAaron Patterson2012-11-153-0/+11
* | | stop hardcoding FrontBase adapter conditionalsAaron Patterson2012-11-151-1/+1
* | | stop passing *args to generate aliasesAaron Patterson2012-11-151-4/+2
* | | create fewer relation objectsAaron Patterson2012-11-151-3/+6
* | | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-1527-92/+321
|\ \ \
| * | | Disallow ability to use EncryptedCookieJar with DummyKeyGeneratorSantiago Pastorino2012-11-031-0/+5
| * | | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-0312-23/+23
| * | | Move ensure_secret_secure to DummyKeyGeneratorSantiago Pastorino2012-11-033-25/+25
| * | | Cache generated keys per KeyGenerator instance using salt + key_sizeSantiago Pastorino2012-11-032-5/+22
| * | | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-035-21/+48
| * | | Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-037-31/+14
| * | | Add encrypted cookie storeSantiago Pastorino2012-11-035-9/+78