Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reset the request parameters after a constraints check | Andrew White | 2012-05-03 | 1 | -0/+19 |
| | | | | | | | | | | | | | | A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510. (cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b) | ||||
* | Deprecate link_to_function and button_to_function helpers | Rafael Mendonça França | 2012-04-30 | 1 | -12/+24 |
| | |||||
* | Restore interpolation of path option in redirect routes | Andrew White | 2012-04-29 | 1 | -1/+40 |
| | |||||
* | Escape interpolated params when redirecting - fixes #5688 | Andrew White | 2012-04-29 | 1 | -0/+28 |
| | |||||
* | Remove warning of unused variable | Rafael Mendonça França | 2012-04-29 | 1 | -1/+1 |
| | |||||
* | Fix the build. | Rafael Mendonça França | 2012-04-29 | 1 | -2/+2 |
| | | | | | * The method for persisted records in 3-2-branch is 'PUT' * size is generated by default in inputs | ||||
* | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 1 | -2/+40 |
| | | | | | | | | (cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f) Conflicts: actionpack/test/controller/test_test.rb | ||||
* | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 1 | -0/+17 |
| | | | | closes #3341 | ||||
* | Do not mutate options hash | Carlos Antonio da Silva | 2012-04-27 | 1 | -0/+6 |
| | |||||
* | Fix broken test from the earlier merge conflict | Prem Sichanugrist | 2012-04-23 | 1 | -9/+11 |
| | | | | Seriously people, please run the test before submitting pull request. | ||||
* | converting some tests to assert_raises, and DRY'ing retrieve_variable changes | Tieg Zaharia | 2012-04-16 | 1 | -46/+22 |
| | | | | | | Conflicts: actionpack/test/template/render_test.rb | ||||
* | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 1 | -0/+9 |
| | |||||
* | default_url_options does not receive one argument anymore | Rafael Mendonça França | 2012-04-08 | 2 | -2/+2 |
| | |||||
* | Fix the redirect when it receive blocks with arity of 1. | Rafael Mendonça França | 2012-03-31 | 1 | -0/+15 |
| | | | | Closes #5677 | ||||
* | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 1 | -0/+7 |
| | |||||
* | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 1 | -0/+1 |
| | | | | Closes #5632 | ||||
* | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 1 | -16/+22 |
| | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | ||||
* | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 1 | -6/+48 |
| | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default) | ||||
* | Merge pull request #5622 from rafaelfranca/fix-2492-3-2 | Jeremy Kemper | 2012-03-27 | 1 | -0/+35 |
|\ | | | | | [3-2-stable] Fix label_tag to merge the options hash with the object hash | ||||
| * | Check if the options hash already exists and merge it with the another | Rafael Mendonça França | 2012-03-27 | 1 | -6/+19 |
| | | | | | | | | | | | | hash. Closes #2492 and #5614 | ||||
| * | Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label. | Andrey Samsonov | 2012-03-27 | 1 | -0/+22 |
| | | | | | | | | | | | | objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example | ||||
* | | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml | Santiago Pastorino | 2012-03-27 | 1 | -6/+6 |
|\ \ | |/ |/| | Textarea newline fix breaks haml (3-2-stable) | ||||
| * | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 1 | -6/+6 |
| | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation. | ||||
* | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 2 | -0/+14 |
|/ | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | ||||
* | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 1 | -0/+8 |
| | |||||
* | Build fix for ruby1.8.7-358 | Arun Agrawal | 2012-03-19 | 2 | -9/+7 |
| | |||||
* | Add missing test for #5308 | Piotr Sarnacki | 2012-03-17 | 3 | -0/+15 |
| | |||||
* | Fix #5440 - multiple render_to_string breaks partials formats | Piotr Sarnacki | 2012-03-17 | 5 | -0/+30 |
| | | | | | | | | | This fixes situation where rendering template to string sets `rendered_format` to the format rendered there. This is ok to have consistent formats rendered in partials, but it breaks on next renders if format is explicitly set or on last render where default format does not necessarily need to be the format of first rendered template. | ||||
* | Merge pull request #5457 from brianmario/typo-fix | Aaron Patterson | 2012-03-15 | 1 | -1/+1 |
| | | | | Fix typo in redirect test | ||||
* | Merge pull request #5456 from brianmario/redirect-sanitization | Aaron Patterson | 2012-03-15 | 1 | -0/+20 |
| | | | | Strip null bytes from Location header | ||||
* | Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence | Aaron Patterson | 2012-03-15 | 1 | -0/+4 |
|\ | | | | | 3 2 static invalid byte sequence | ||||
| * | fix ArgumentError being raised in case of invalid byte sequences | Michael Reinsch | 2012-03-08 | 1 | -0/+4 |
| | | |||||
* | | Remove ActionController::TestCase#rescue_action_in_public! | Piotr Sarnacki | 2012-03-15 | 1 | -5/+0 |
| | | | | | | | | | | | | This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares. | ||||
* | | Allow you to force the authenticity_token to be rendered even on remote ↵ | David Heinemeier Hansson | 2012-03-14 | 1 | -0/+11 |
| | | | | | | | | forms if you pass true | ||||
* | | Do not include the authenticity token in forms where remote: true as ajax ↵ | David Heinemeier Hansson | 2012-03-14 | 1 | -0/+11 |
|/ | | | | forms use the meta-tag value | ||||
* | Add test case for #5307 | Carlos Antonio da Silva | 2012-03-07 | 1 | -2/+6 |
| | |||||
* | Failing test for mime responder respond_with using a block. | Mario Visic | 2012-03-05 | 1 | -0/+36 |
| | |||||
* | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 1 | -2/+6 |
| | |||||
* | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 1 | -1/+8 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| * | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 1 | -1/+8 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| | * | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 1 | -1/+8 |
| | | | |||||
* | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 2 | -37/+37 |
| | | | | | | | | | | | | Closes #393 | ||||
* | | | Adding tests for non-optional glob parameters | Andrew White | 2012-02-26 | 1 | -2/+27 |
| | | | |||||
* | | | assert => assert_equal | Arun Agrawal | 2012-02-25 | 1 | -3/+3 |
| | | | |||||
* | | | Checking headers in a better way. as doing here | Arun Agrawal | 2012-02-25 | 1 | -4/+3 |
| | | | | | | | | | | | | 406ece4729e8fd81f156bcb3fce16e938522466e | ||||
* | | | Build fix for ruby187-p358 | Arun Agrawal | 2012-02-25 | 1 | -2/+7 |
|/ / | |||||
* | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 3 | -4/+9 |
| | | | | | | | | | | | | is being rendered Closes #5025 part 2 | ||||
* | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 1 | -1/+1 |
| | | |||||
* | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 1 | -1/+2 |
| | | | | | | | | view | ||||
* | | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 4 | -25/+27 |
|/ |