aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #8318 from Empact/fixture-fileRafael Mendonça França2012-11-271-5/+7
|\
| * Use File.join to better integrate fixture_path in fixture_file_upload.Ben Woosley2012-11-261-5/+7
* | Cleanup CacheHelper changes allowing opt-out of cache digestsDrew Ulmer2012-11-271-2/+2
* | No sort Hash options in #grouped_options_for_selectSergey Kojin2012-11-271-6/+4
* | Fix Strong Parameters docs.Uģis Ozols2012-11-271-2/+1
* | unshift html-scanner into $LOAD_PATH rather than appendAkira Matsuda2012-11-271-1/+1
* | Remove warning of circular requireRafael Mendonça França2012-11-271-1/+1
* | Accept symbols as #send_data :disposition valueElia Schito2012-11-271-0/+1
* | Merge pull request #8316 from roberto/assert_template_validate_optionsCarlos Antonio da Silva2012-11-261-0/+2
|\ \
| * | assert_template: validating option keysRoberto Soares2012-11-251-0/+2
* | | Merge pull request #8317 from latortuga/cache-digest-opt-outDavid Heinemeier Hansson2012-11-261-1/+23
|\ \ \ | |/ / |/| |
| * | Add explicit opt-out for fragment cache digestingDrew Ulmer2012-11-251-1/+23
* | | Merge pull request #8302 from roberto/assert_template_empty_stringCarlos Antonio da Silva2012-11-251-1/+1
|\ \ \ | |/ / |/| |
| * | `assert_template` fails with empty string.Roberto Soares2012-11-231-8/+4
| * | `assert_template` fails with empty string when a template has been renderedRoberto Soares2012-11-231-4/+8
* | | Merge pull request #8306 from senny/documentation_for_hidden_field_idCarlos Antonio da Silva2012-11-241-0/+5
|\ \ \ | |_|/ |/| |
| * | document :hidden_field_id option for fields_forYves Senn2012-11-241-0/+5
* | | 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
* | Remove private partial/template renderer methodsCarlos Antonio da Silva2012-11-213-14/+3
* | Merge pull request #8183 from jcoglan/objectless_sessionsJon Leighton2012-11-212-11/+26
|\ \
| * | Store FlashHashes in the session as plain hashes rather than custom objects w...James Coglan2012-11-092-11/+26
* | | 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
| |/ |/|
* | render every partial with a new `PartialRenderer`.Yves Senn2012-11-191-2/+2
* | 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-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
* | | Refactor url methods a bitCarlos Antonio da Silva2012-11-161-9/+9
* | | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`.Joost Baaij2012-11-161-0/+5
* | | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-156-45/+111
|\ \ \
| * | | 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-033-13/+29
| * | | Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-031-3/+2
| * | | Add encrypted cookie storeSantiago Pastorino2012-11-032-7/+25