aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Update tests for #9704, named route collisionsJeremy Kemper2013-03-242-6/+7
| | | | | * Fix named route collision in mount test fixture * Update controller named route precedence test
* Tender love for #9909 :heart:Jeremy Kemper2013-03-241-1/+1
|
* Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵Trevor Turk2013-03-243-99/+159
| | | | signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4
* Merge pull request #9704 from trevorturk/warn-about-skipped-routesJeremy Kemper2013-03-243-20/+31
|\ | | | | Raise an ArgumentError when a clashing named route is defined
| * 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 #to_s method to VERSION modules
| * | 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 missing action_missing Conflicts: actionpack/CHANGELOG.md
| * Fix broken ActionController#action_missingJanko Luin2013-03-203-1/+18
| | | | | | | | | | A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing.
* | Merge pull request #9794 from schneems/schneems/email-hostAndrew White2013-03-193-1/+26
|\ \ | | | | | | Fix improperly configured host in generated urls
| * | Fix improperly configured host in generated urlsschneems2013-03-193-1/+26
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the host in `default_url_options` is accidentally set with a protocol such as ``` host: "http://example.com" ``` then the generated url will have the protocol twice `http://http://example.com` which is not what the user intended. Likely they wanted to define a host `host: "example.com"` and a `protocol: "http://"` but did not know the convention. This may not the most common problem, but when it happens it can go undetected for a while. I accidentally added `http://` out of habit recently only to find all the links in my emails were broken after deploying a demo site to production. Rather than allow this accident go undetected, we can fix the problem in line by properly setting the protocol and host. I was able to find this related question on stack overflow: http://stackoverflow.com/questions/5878329/rails-3-devise-how-do-i-make-the-email-confirmation-links-use-secure-https-n where the answer was highly upvoted. This is based off of work in #7415 cc/ @pixeltrix ATP Action Mailer and Action Pack
* / 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
| | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* 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
|\ | | | | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
| * 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
|\ \ | | | | | | i18n locale fallback for localized views
| * | 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 actionpack
| * | | 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
|\ \ | | | | | | multipart POST - utf8 param name not encoded
| * | 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
|/ / | | | | | | | | | | | | | | | | The env hash passed to `Http::Headers#new` must be in env format. Also be aware that the passed hash is modified directly. docs and test-cases for setting headers/env in functional tests. Follow up to #9700.
* | Handle conditional get in live requests - this will prevent error when using ↵Bernard Potocki2013-03-142-0/+19
| | | | | | | | stale on live streams(issue #9636)
* | Add extra clarifying line in docs. [ci skip]Steve Klabnik2013-03-131-0/+1
| |
* | Fix docs: response -> request.Steve Klabnik2013-03-131-2/+2
| | | | | | | | Even though I read it carefully, my brain tricked me. :cry:
* | Merge pull request #9698 from garethrees/request_documentationSteve Klabnik2013-03-131-0/+16
|\ \ | | | | | | Add documentation to ActionDispatch::Request
| * | 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
| | |
* | | allow headers and env to be passed in `IntegrationTest`.Yves Senn2013-03-135-36/+119
| | | | | | | | | | | | Closes #6513.
* | | refactor, `Http::Headers` stores headers in env notationYves Senn2013-03-132-29/+42
| | | | | | | | | | | | | | | Also: cleanup, use consistent syntax for `Http::Header` and test.
* | | Http::Headers respects headers that are not prefixed with HTTP_Yves Senn2013-03-133-7/+30
| | |
* | | Change from each to each_value in http/parameters since we don't use keyVipul A M2013-03-131-1/+1
|/ /
* | Skip fetching path if the iteration is going to be skippedCarlos Antonio da Silva2013-03-111-2/+2
| |
* | Change from each to each_value on hash to avoid unused variable warningVipul A M2013-03-111-1/+1
| |
* | Merge pull request #9626 from dasch/dasch/instrument-strong-paramsJosé Valim2013-03-092-1/+7
|\ \ | | | | | | Use AS::Notifications to instrument Strong Params
| * | Use the instrumentation framework to instrument Strong ParamsDaniel Schierbeck2013-03-072-1/+7
| | |
* | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].Yves Senn2013-03-091-11/+11
| | |