aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_casesCarlos Antonio da Silva2013-03-282-3/+3
|\
| * Refactored to remove unused variableAnupam Choudhury2013-03-282-3/+3
* | Fixed grammarAnupam Choudhury2013-03-281-1/+1
|/
* Merge pull request #8458 from lucisferre/improve-layout-override-fallback-beh...Rafael Mendonça França2013-03-274-5/+68
|\
| * Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-274-5/+67
* | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.kennyj2013-03-261-1/+1
* | Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5Rafael Mendonça França2013-03-251-0/+10
|\ \
| * | Skipping test for OpenSSL::PKCS5 JRubyArun Agrawal2013-03-251-0/+10
* | | if cookie is tampered with then nil is returned [ci skip]Neeraj Singh2013-03-251-4/+2
|/ /
* | Update tests for #9704, named route collisionsJeremy Kemper2013-03-242-6/+7
* | Tender love for #9909 :heart:Jeremy Kemper2013-03-241-1/+1
* | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing sign...Trevor Turk2013-03-243-99/+159
* | Merge pull request #9704 from trevorturk/warn-about-skipped-routesJeremy Kemper2013-03-243-20/+31
|\ \
| * | Tweak exception message to avoid giving potentially misleading suggestionsTrevor Turk2013-03-201-2/+3
| * | Raise an ArgumentError when a clashing named route is definedTrevor Turk2013-03-193-20/+30
* | | Fix some typosVipul A M2013-03-242-2/+2
* | | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-231-6/+7
|\ \ \
| * | | Add version method to top level modulesCharlie Somerville2013-03-211-6/+7
* | | | Changed 'args' to 'arguments' in test descriptionPrathamesh Sonpatki2013-03-242-2/+2
* | | | Fix documentation markup [ci skip]Rafael Mendonça França2013-03-231-0/+2
* | | | StringIO is not required by default in JRubyArun Agrawal2013-03-221-0/+1
|/ / /
* | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-202-1/+13
|\ \ \ | |/ / |/| |
| * | Fix broken ActionController#action_missingJanko Luin2013-03-203-1/+18
* | | Merge pull request #9794 from schneems/schneems/email-hostAndrew White2013-03-193-1/+26
|\ \ \
| * | | Fix improperly configured host in generated urlsschneems2013-03-193-1/+26
| |/ /
* / / Remove mentions of "app" from http request docs [ci skip]Carlos Antonio da Silva2013-03-191-12/+10
|/ /
* | drop an unused hash; change slang to SPECIALVipul A M2013-03-191-2/+2
* | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-181-1/+1
* | instruct RDoc to only parse Ruby files under lib [Fixes #9779]Xavier Noria2013-03-181-1/+1
* | Digest auth should not 500 when given a basic header.Brad Dunbar2013-03-183-0/+14
* | Merge branch 'master-sec'Aaron Patterson2013-03-182-5/+20
|\ \
| * | fix protocol checking in sanitization [CVE-2013-1857]Aaron Patterson2013-03-152-2/+12
| * | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]Charlie Somerville2013-03-152-3/+8
* | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacksCarlos Antonio da Silva2013-03-183-1/+21
|\ \ \
| * | | Include I18n fallbacks in :locale lookup contextJuan Barreneche2013-03-163-1/+21
* | | | remove ancient TODOs [ci skip].Yves Senn2013-03-182-3/+0
* | | | Merge pull request #9754 from macksmind/fix_actionpack_warningsRafael Mendonça França2013-03-172-2/+3
|\ \ \ \
| * | | | Fix rake test warnings in actionpackMack Earnhardt2013-03-172-2/+3
| |/ / /
* / / / Allow pass multipart option to form_forGrzegorz Derebecki2013-03-172-3/+3
|/ / /
* | | Merge pull request #5606 from teohm/multipart_unicode_param_nameSteve Klabnik2013-03-156-32/+54
|\ \ \
| * | | UTF-8 encode all keys and values in nested params hash.Teo Hui Ming2013-03-156-32/+54
* | | | Fix typos and improve docs a bit [ci skip]Carlos Antonio da Silva2013-03-151-7/+5
* | | | document request simulation methods in functional tests.Yves Senn2013-03-151-7/+27
* | | | `Http::Headers` directly modifies the passed environment.Yves Senn2013-03-155-12/+48
|/ / /
* | | Handle conditional get in live requests - this will prevent error when using ...Bernard Potocki2013-03-142-0/+19
* | | Add extra clarifying line in docs. [ci skip]Steve Klabnik2013-03-131-0/+1
* | | Fix docs: response -> request.Steve Klabnik2013-03-131-2/+2
* | | Merge pull request #9698 from garethrees/request_documentationSteve Klabnik2013-03-131-0/+16
|\ \ \
| * | | Add documentation to ActionDispatch::RequestGareth Rees2013-03-131-0/+16
* | | | `Http::Headers` respects dotted env vars, symbols, headers with numbers.Yves Senn2013-03-132-11/+33