aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-046-14/+2
|\ \
| * | Remove nodoc from FlashHash #[]= [ci skip]Pablo Torres2012-12-011-1/+1
| * | Cleans and removes 'Examples' tag [ci skip]Alvaro Pereyra2012-12-011-2/+0
| * | Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-013-10/+0
| * | Revert "Remove trailing whitespaces"Florent Guilleux2012-12-011-1/+1
| * | Remove trailing whitespacesFlorent Guilleux2012-12-011-1/+1
| * | nodoc AD & AV railties classesCarlos Duclos2012-12-011-1/+1
| |/
* / Fixed issue where routes with globs caused constraints on that glob toMaura Fitzgerald2012-12-041-1/+1
|/
* Use File.join to better integrate fixture_path in fixture_file_upload.Ben Woosley2012-11-261-5/+7
* Refector a bit to remove extra slice iteration and splat callCarlos Antonio da Silva2012-11-241-2/+2
* Use merge! in some places to avoid creating extra hashesCarlos Antonio da Silva2012-11-242-4/+4
* Simplify scope options recovery by using merge!Carlos Antonio da Silva2012-11-241-6/+1
* Normalize scope recovering :blocks option nameCarlos Antonio da Silva2012-11-241-3/+3
* Simplify constraints condition in scope when checking for HashCarlos Antonio da Silva2012-11-241-7/+4
* Allow setting a symbol as path in scope on routesGuillermo Iguaran2012-11-211-1/+1
* Merge pull request #8183 from jcoglan/objectless_sessionsJon Leighton2012-11-211-10/+24
|\
| * Store FlashHashes in the session as plain hashes rather than custom objects w...James Coglan2012-11-091-10/+24
* | Correct the use of params options when given to url_forCarlos Antonio da Silva2012-11-191-1/+1
* | Fix issue with params in url_fortumayun2012-11-191-1/+1
* | Fix UpgradeSignatureToEncryptionCookieStore docSantiago Pastorino2012-11-191-9/+4
* | 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-171-17/+22
|\ \
| * | 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
* | | Add UpgradeSignatureToEncryptionCookieStoreSantiago Pastorino2012-11-162-2/+25
* | | 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
* | | Refactor url methods a bitCarlos Antonio da Silva2012-11-161-9/+9
* | | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-153-34/+99
|\ \ \
| * | | 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-031-24/+0
| * | | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-032-11/+26
| * | | Add encrypted cookie storeSantiago Pastorino2012-11-031-3/+20
| * | | Add cookie.encrypted which returns an EncryptedCookieJarSantiago Pastorino2012-11-031-0/+48
| * | | Sign cookies using key deriverSantiago Pastorino2012-11-031-15/+19
| | |/ | |/|
* | | Use get in the redirection doc examplesCarlos Antonio da Silva2012-11-091-7/+7
* | | Deprecate Hash#diff.Steve Klabnik2012-11-091-3/+1
* | | implement to_a and to_ary so that the Array() call in template.rb willAaron Patterson2012-11-091-9/+14
* | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-091-24/+9
* | | Remove free usage of #tapCarlos Antonio da Silva2012-11-081-3/+4
* | | Merge pull request #8017 from jcoglan/objectless_sessionsJon Leighton2012-11-081-9/+23
|\ \ \
| * | | Store FlashHashes in the session as plain hashes rather than custom objects w...James Coglan2012-11-031-9/+23
| |/ /
* | | Merge pull request #8115 from senny/7842_handle_trailing_slash_with_enginesRafael Mendonça França2012-11-081-3/+1
|\ \ \
| * | | routing prefix slash replacement is no longer necessaryYves Senn2012-11-041-3/+1
| |/ /
* / / Add ensure block to make sure the state is properly restoredCarlos Antonio da Silva2012-11-041-1/+1
|/ /
* / Clear url helpers when reloading routesSantiago Pastorino2012-11-021-0/+1
|/