Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Digest auth should not 500 when given a basic header. | Brad Dunbar | 2013-03-18 | 1 | -0/+8 | |
| | | | ||||||
* | | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 1 | -0/+15 | |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | * 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 Patterson | 2013-03-15 | 1 | -0/+10 | |
| | | | ||||||
| * | | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] | Charlie Somerville | 2013-03-15 | 1 | -0/+5 | |
| | | | ||||||
* | | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks | Carlos Antonio da Silva | 2013-03-18 | 1 | -0/+9 | |
|\ \ \ | | | | | | | | | i18n locale fallback for localized views | |||||
| * | | | Include I18n fallbacks in :locale lookup context | Juan Barreneche | 2013-03-16 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | remove ancient TODOs [ci skip]. | Yves Senn | 2013-03-18 | 2 | -3/+0 | |
| | | | | ||||||
* | | | | Merge pull request #9754 from macksmind/fix_actionpack_warnings | Rafael Mendonça França | 2013-03-17 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix rake test warnings in actionpack | |||||
| * | | | | Fix rake test warnings in actionpack | Mack Earnhardt | 2013-03-17 | 1 | -1/+1 | |
| |/ / / | ||||||
* / / / | Allow pass multipart option to form_for | Grzegorz Derebecki | 2013-03-17 | 1 | -2/+2 | |
|/ / / | ||||||
* | | | Merge pull request #5606 from teohm/multipart_unicode_param_name | Steve Klabnik | 2013-03-15 | 3 | -1/+30 | |
|\ \ \ | | | | | | | | | multipart POST - utf8 param name not encoded | |||||
| * | | | UTF-8 encode all keys and values in nested params hash. | Teo Hui Ming | 2013-03-15 | 3 | -1/+30 | |
| | | | | ||||||
* | | | | `Http::Headers` directly modifies the passed environment. | Yves Senn | 2013-03-15 | 2 | -6/+38 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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 Potocki | 2013-03-14 | 1 | -0/+15 | |
| | | | | | | | | | | | | stale on live streams(issue #9636) | |||||
* | | | `Http::Headers` respects dotted env vars, symbols, headers with numbers. | Yves Senn | 2013-03-13 | 1 | -0/+27 | |
| | | | ||||||
* | | | allow headers and env to be passed in `IntegrationTest`. | Yves Senn | 2013-03-13 | 2 | -1/+59 | |
| | | | | | | | | | | | | Closes #6513. | |||||
* | | | refactor, `Http::Headers` stores headers in env notation | Yves Senn | 2013-03-13 | 1 | -12/+21 | |
| | | | | | | | | | | | | | | | Also: cleanup, use consistent syntax for `Http::Header` and test. | |||||
* | | | Http::Headers respects headers that are not prefixed with HTTP_ | Yves Senn | 2013-03-13 | 1 | -6/+13 | |
| | | | ||||||
* | | | Change from each to each_value on hash to avoid unused variable warning | Vipul A M | 2013-03-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix incorrectly appended square brackets to a multiple select box | Olek Janiszewski | 2013-03-08 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an explicit name has been given and it already ends with "[]" Before: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][][]" ...> After: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][]" ...> | |||||
* | | | Fix warnings | Carlos Antonio da Silva | 2013-03-07 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #9464 from jcoyne/assert_template_file | Rafael Mendonça França | 2013-03-07 | 1 | -0/+35 | |
|\ \ \ | | | | | | | | | Allow use of assert_template with the :file option. | |||||
| * | | | Allow use of assert_template with the :file option. | Justin Coyne | 2013-03-01 | 1 | -0/+35 | |
| | | | | | | | | | | | | | | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1 | |||||
* | | | | Add missing require to debug helper test | Carlos Antonio da Silva | 2013-03-05 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Add DebugHelperTest | robertomiranda | 2013-03-05 | 1 | -0/+8 | |
| |/ / |/| | | ||||||
* | | | Fix formats on xhr requests when HTTP_ACCEPT is empty string | maximerety | 2013-03-04 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | Fix ActionDispatch::Request#formats on xhr requests when HTTP_ACCEPT header is empty string. About issue #7774, same fix as in commit bebb02f but for xhr requests. | |||||
* | | | Use custom visitor class for optimized url helpers | Andrew White | 2013-03-03 | 1 | -0/+6 | |
|/ / | | | | | | | | | | | | | | | Rather than trying to use gsub to remove the optional route segments, which will fail with nested optional segments, use a custom visitor class that returns a empty string for group nodes. Closes #9524 | |||||
* | | Merge pull request #9366 from killthekitten/fix-content_for-regression | Rafael Mendonça França | 2013-02-28 | 1 | -0/+4 | |
|\ \ | | | | | | | Fix for #9360 content_for regression | |||||
| * | | Fix #9360 regression in content_for | Nikolay Shebanov | 2013-02-25 | 1 | -0/+4 | |
| | | | ||||||
* | | | `format: true` does not override existing format constraints. | Yves Senn | 2013-02-27 | 1 | -0/+24 | |
| | | | | | | | | | | | | | | | | | | | | | Closes #9466. Passing `format: true` used to override the constraints: { format: /json/ } with `/.+/`. This patch only sets the format if there is no constraint present. | |||||
* | | | Merge pull request #9218 from Fivell/master | Carlos Antonio da Silva | 2013-02-27 | 1 | -0/+14 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix calculation of db_runtime property in ActiveRecord::Railties::ControllerRuntime#cleanup_view_runtime. Previously, after raising ActionView::MissingTemplate, db_runtime was not populated. Closes #9218, Fixes #9215. Conflicts: activerecord/CHANGELOG.md | |||||
| * | | | fix db_runtime attribute value after raising ActionView::MissingTemplate ↵ | Igor | 2013-02-27 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | exception | |||||
* | | | | cleanup AP number_helpers_test | Yves Senn | 2013-02-27 | 1 | -47/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * use 1.9 style hash syntax * don't use brances on assert_equal * prefere " over ' | |||||
* | | | | remove duplicated number_helper tests in AP. They are already in AS. | Yves Senn | 2013-02-27 | 1 | -270/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With 155cd5e6 the number_helpers were moved into AS all the tests were copied over but the tests in AP were not deleted. This is confusing. I removed all duplicated tests and reorganized the tests in AP to only test the functionality, that is added in AP. | |||||
* | | | | allow non-String default params in the router. | Yves Senn | 2013-02-26 | 1 | -1/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9435. Skip valid encoding checks for non-String parameters that come from the matched route's defaults. | |||||
* | | | | the router allows String contraints. | Yves Senn | 2013-02-26 | 1 | -0/+36 | |
| | | | | | | | | | | | | | | | | Closes #9432. | |||||
* | | | | Merge pull request #9434 from zires/dev | Rafael Mendonça França | 2013-02-26 | 1 | -0/+4 | |
|\ \ \ \ | | | | | | | | | | | Journey::Path::Pattern#new raise more meaningful exception message. | |||||
| * | | | | Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful ↵ | zires | 2013-02-27 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | exception message. | |||||
* | | | | | Add tests for #9441 | Francesco Rodriguez | 2013-02-26 | 1 | -0/+16 | |
|/ / / / | ||||||
* | | | | Merge pull request #8530 from dasch/dependency-trackers | David Heinemeier Hansson | 2013-02-25 | 2 | -1/+48 | |
|\ \ \ \ | |_|_|/ |/| | | | Custom dependency trackers for the template digestor | |||||
| * | | | Register trackers on extensions, not handlers | Daniel Schierbeck | 2013-02-20 | 2 | -5/+6 | |
| | | | | ||||||
| * | | | Return an empty array if no tracker is found | Daniel Schierbeck | 2013-02-20 | 1 | -2/+9 | |
| | | | | ||||||
| * | | | Allow registering custom dependency trackers | Daniel Schierbeck | 2013-02-20 | 2 | -1/+40 | |
| | | | | ||||||
* | | | | fix respond_to without blocks not working if one of the blocks is all | grosser | 2013-02-24 | 2 | -0/+22 | |
| | | | | ||||||
* | | | | Move number_to_human test from AP to AS | Carlos Antonio da Silva | 2013-02-22 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well. | |||||
* | | | | Address edge case for number_to_human with units option. | hoffm | 2013-02-22 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when the units hash does not contain the needed key, e.g. when the number provided is less than the largest key provided. | |||||
* | | | | Merge pull request #9334 from NARKOZ/time_tag | Andrew White | 2013-02-21 | 1 | -18/+18 | |
|\ \ \ \ | | | | | | | | | | | use ISO 8601 format in time_tag helper | |||||
| * | | | | fix time_tag helper and update tests to not rely on dynamically generated values | Nihad Abbasov | 2013-02-22 | 1 | -18/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before `time_tag Date.today` will return `<time datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`. This commit fixes time_tag helper to use RFC-3339 full-date format (Y-m-d) in datetime attribute. | |||||
* | | | | | Merge pull request #9361 from senny/improved_match_shorthand_syntax | Andrew White | 2013-02-21 | 1 | -0/+27 | |
|\ \ \ \ \ | | | | | | | | | | | | | determine the match shorthand target early. | |||||
| * | | | | | determine the match shorthand target early. | Yves Senn | 2013-02-21 | 1 | -0/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes. |