| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2013-01-08 | 3 | -9/+7 |
|\ |
|
| * | bumping version | Aaron Patterson | 2013-01-08 | 1 | -1/+1 |
| * | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin... | Aaron Patterson | 2013-01-08 | 2 | -8/+6 |
| * | Avoid Rack security warning no secret provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 |
* | | Merge pull request #8812 from rubys/master | Carlos Antonio da Silva | 2013-01-08 | 1 | -1/+1 |
* | | Avoid Rack security warning no secret provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 |
* | | Do not call fields_for from form_for, to avoid instantiating two builders | Carlos Antonio da Silva | 2013-01-06 | 1 | -8/+6 |
* | | Remove suggestion that Procs can be used as session secrets. | James Coglan | 2013-01-05 | 1 | -7/+4 |
* | | Merge pull request #8716 from miguelff/3-2-stable | Rafael Mendonça França | 2013-01-03 | 1 | -1/+1 |
|\ \ |
|
| * | | Merge tag 'v3.2.10' into 3-2-stable | Miguel | 2013-01-03 | 1 | -1/+1 |
| |\| |
|
| | * | bumping version to 3.2.10 | Aaron Patterson | 2012-12-23 | 1 | -1/+1 |
* | | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typo | Carlos Antonio da Silva | 2013-01-03 | 1 | -1/+1 |
|/ / |
|
* | | Backport #8701, do not append a second slash with `trailing_slash: true` | Yves Senn | 2013-01-02 | 1 | -1/+5 |
* | | fix block.arity raise nil error when not given a block to "content_tag_for" | jasl | 2013-01-02 | 1 | -1/+3 |
* | | Clear url helper methods when routes are reloaded | Andrew White | 2012-12-14 | 1 | -6/+12 |
* | | Merge pull request #8490 from mattv/fix_request_raw_post | Rafael Mendonça França | 2012-12-11 | 1 | -2/+3 |
* | | Make distance_of_time_in_words work with DateTime offsets | Andrew White | 2012-12-04 | 1 | -2/+3 |
* | | Make output of distance_of_time_in_words consistent | Andrew White | 2012-12-04 | 1 | -2/+2 |
* | | Override <%== to always behave as literal text rather than toggling based on ... | Jeremy Kemper | 2012-12-03 | 1 | -0/+11 |
* | | Merge pull request #8402 from senny/8376_descriptive_error_message_for_partia... | Rafael Mendonça França | 2012-12-02 | 1 | -1/+1 |
* | | Accept symbols as #send_data :disposition value | Elia Schito | 2012-11-27 | 1 | -1/+1 |
* | | Add i18n scope to disance_of_time_in_words. | Steve Klabnik | 2012-11-26 | 1 | -3/+7 |
* | | Refactor Generator class to not rely on in-place editing the controller | Andrew White | 2012-11-16 | 1 | -5/+10 |
* | | Fix bug when url_for changes controller. | Nikita Beloglazov | 2012-11-16 | 1 | -2/+2 |
* | | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext | José Valim | 2012-11-16 | 1 | -0/+5 |
* | | [ci skip] Correct examples for form_tag helper. | DawidJanczak | 2012-11-14 | 1 | -2/+2 |
* | | Merge branch '3-2-9' into 3-2-stable | Santiago Pastorino | 2012-11-12 | 1 | -1/+1 |
|\| |
|
| * | Bump to 3.2.9 | Santiago Pastorino | 2012-11-12 | 1 | -1/+1 |
* | | Merge branch '3-2-9' into 3-2-stable | Santiago Pastorino | 2012-11-09 | 1 | -1/+1 |
|\| |
|
| * | Bump up to 3.2.9.rc3 | Santiago Pastorino | 2012-11-09 | 1 | -1/+1 |
* | | Fix redirect example block | Carlos Antonio da Silva | 2012-11-09 | 1 | -3/+3 |
* | | Merge pull request #8093 from nikitug/keep_app_x_ua_compatible | Carlos Antonio da Silva | 2012-11-08 | 1 | -1/+7 |
* | | backport, handle trailing slash with engines | Yves Senn | 2012-11-08 | 1 | -1/+1 |
* | | Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tag | Rafael Mendonça França | 2012-11-08 | 1 | -1/+3 |
|/ |
|
* | Clear url helpers when reloading routes | Santiago Pastorino | 2012-11-02 | 1 | -0/+1 |
* | Revert "Merge pull request #7668 from Draiken/fix_issue_6497" | Rafael Mendonça França | 2012-11-02 | 1 | -1/+1 |
* | Bump to 3.2.9.rc2 | Santiago Pastorino | 2012-11-01 | 1 | -1/+1 |
* | Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased" | Rafael Mendonça França | 2012-10-31 | 1 | -13/+6 |
* | Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va... | Rafael Mendonça França | 2012-10-30 | 2 | -23/+23 |
* | Bump to 3.2.9.rc1 | Santiago Pastorino | 2012-10-29 | 1 | -2/+2 |
* | Accept :remote as symbol in link_to options | Riley | 2012-10-06 | 1 | -1/+3 |
* | Merge pull request #7848 from senny/3415_assert_template_has_nil_variable | Rafael Mendonça França | 2012-10-06 | 1 | -3/+7 |
* | Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables | Rafael Mendonça França | 2012-10-01 | 2 | -23/+23 |
* | Merge pull request #7789 from senny/7777_resource_functions_modify_options | Rafael Mendonça França | 2012-10-01 | 1 | -2/+2 |
* | Since File instance doesn't respond to #open use a double to test the | Rafael Mendonça França | 2012-09-30 | 1 | -1/+1 |
* | Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bu... | Jeremy Kemper | 2012-09-30 | 1 | -20/+12 |
* | Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased | Rafael Mendonça França | 2012-09-30 | 1 | -6/+13 |
* | Don't paramify ActionDispatch::Http::UploadedFile in tests | Tim Vandecasteele | 2012-09-29 | 1 | -1/+1 |
* | Shush uninitialized @_layout warning | Jeremy Kemper | 2012-09-28 | 1 | -1/+1 |
* | Revert "Revert "Respect `config.digest = false` for `asset_path`"" | Rafael Mendonça França | 2012-09-20 | 1 | -1/+3 |