aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Removed extra call to #diff in #assert_recognizes. assert_equal calls it for ...Ryan Davis2012-11-171-4/+7
* Improve UpgradeSignatureToEncryptionCookieStore docsSantiago Pastorino2012-11-161-1/+14
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-172-20/+25
|\
| * 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
| * change match to get and add single quotes in routing/redirection [ci-skip]Cesar Carruitero2012-11-081-8/+8
| * Hash Syntax to 1.9 converisonAvnerCohen2012-11-071-3/+3
* | Add UpgradeSignatureToEncryptionCookieStoreSantiago Pastorino2012-11-163-7/+31
* | 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
* | Move changelog entry from #8235 to the top [ci skip]Carlos Antonio da Silva2012-11-161-7/+7
* | Refactor url methods a bitCarlos Antonio da Silva2012-11-161-9/+9
* | Fix failing template testsCarlos Antonio da Silva2012-11-161-2/+2
* | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`.Joost Baaij2012-11-163-1/+27
* | Remove extra whitespaceSantiago Pastorino2012-11-151-1/+1
* | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-1510-56/+149
|\ \
| * | Disallow ability to use EncryptedCookieJar with DummyKeyGeneratorSantiago Pastorino2012-11-031-0/+5
| * | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-031-3/+3
| * | Move ensure_secret_secure to DummyKeyGeneratorSantiago Pastorino2012-11-032-25/+1
| * | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-034-14/+33
| * | Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-032-4/+5
| * | Add encrypted cookie storeSantiago Pastorino2012-11-032-7/+25
| * | Add cookie.encrypted which returns an EncryptedCookieJarSantiago Pastorino2012-11-032-0/+63
| * | Sign cookies using key deriverSantiago Pastorino2012-11-035-28/+39
* | | Merge pull request #8222 from marcandre/avoid_slashRafael Mendonça França2012-11-142-1/+6
|\ \ \
| * | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlibMarc-Andre Lafortune2012-11-142-1/+6
* | | | Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-1/+1
* | | | lazily calculate name in the options objectAaron Patterson2012-11-131-14/+18
* | | | move include calculation to include method on the options objectAaron Patterson2012-11-131-9/+24
* | | | model name is lazily evaluated in the options objectAaron Patterson2012-11-131-27/+37
* | | | move the controller class to the options objectAaron Patterson2012-11-131-9/+12
* | | | attribute_names will always return a list, so just use any?Aaron Patterson2012-11-131-1/+1
* | | | wrap up hash conversion in the constructorAaron Patterson2012-11-131-5/+5
* | | | use the options object in the wrapper defaultsAaron Patterson2012-11-131-13/+12
* | | | start using options objectAaron Patterson2012-11-132-10/+21
* | | | only do hash lookups on options onceAaron Patterson2012-11-131-13/+15
* | | | replace present? with any? to reduce dependency on ASAaron Patterson2012-11-132-1/+2
* | | | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag t...Aaron Patterson2012-11-121-0/+1
|/ / /
* | | Use get in the redirection doc examplesCarlos Antonio da Silva2012-11-091-7/+7
* | | Merge pull request #8158 from steveklabnik/deprecate_diffCarlos Antonio da Silva2012-11-091-3/+1
|\ \ \
| * | | Deprecate Hash#diff.Steve Klabnik2012-11-091-3/+1
* | | | Removing duplication in callback normalization.Steve Klabnik2012-11-091-7/+8
|/ / /
* | | Merge pull request #8151 from nashby/forwardableCarlos Antonio da Silva2012-11-091-20/+2
|\ \ \
| * | | delegate PathSet's enumerator methodsVasiliy Ermolovich2012-11-091-20/+2
* | | | Fix message about include_blank option.Steve Klabnik + Katrina Owen2012-11-091-1/+1
* | | | implement to_a and to_ary so that the Array() call in template.rb willAaron Patterson2012-11-091-9/+14
* | | | Merge pull request #8147 from gbchaosmaster/gemspecRafael Mendonça França2012-11-081-13/+15
|\ \ \ \
| * | | | Clean up gemspecsVinny Diehl2012-11-081-13/+15
* | | | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-093-47/+10