Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use to_model delegates for polymorphic route generation | Nathaniel Bibler | 2012-06-01 | 1 | -1/+27 |
| | |||||
* | Strip [nil] from parameters hash. | Aaron Patterson | 2012-05-30 | 1 | -1/+6 |
| | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660 | ||||
* | Assets: don't add extension if other given and file exists | Sergey Nartimov | 2012-05-21 | 2 | -0/+3 |
| | | | | | | | | | | | | | | We should lookup if asset without appended extension exists. When sprockets are disabled the asset tag helpers incorporate this logic. When sprockets are enabled we should have the same logic. For example, we have style.ext file in app/assets/stylesheets and we use stylesheet_link_tag in the layout. In this case we should have /assets/style.ext instead of /assets/style.ext.css in the output. Closes #6310 | ||||
* | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-20 | 1 | -2/+2 |
| | |||||
* | Use right option for excerpt text helper in tests, fix build | Carlos Antonio da Silva | 2012-05-19 | 1 | -8/+8 |
| | | | | | | | `excerpt` text helper uses `:radius`, not `line_width` (that is used by `word_wrap` helper). Also cleanup some whitespaces. | ||||
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-source | José Valim | 2012-05-18 | 1 | -0/+1 |
| | | | | Render img tag with empty src if empty string is passed to image_tag. | ||||
* | Deprecate old APIs for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-18 | 1 | -36/+45 |
| | |||||
* | Deprecate `:disable_with` for `button_tag` too | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -6/+15 |
| | |||||
* | Fix typo | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 1 | -8/+8 |
| | |||||
* | Deprecate `:disable_with` in favor of `'data-disable-with'` option for ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -25/+37 |
| | | | | `button_to` and `submit_tag` helpers. | ||||
* | Deprecate `:mouseover` options for `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 1 | -8/+40 |
| | |||||
* | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 1 | -1/+2 |
| | | | | Support data: url scheme | ||||
* | Don't ignore nil positional arguments for url helpers - fixes #6196. | Andrew White | 2012-05-10 | 1 | -0/+34 |
| | |||||
* | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 1 | -0/+80 |
| | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly | ||||
* | Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicates | Santiago Pastorino | 2012-05-09 | 1 | -0/+6 |
|\ | | | | | Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets | ||||
| * | Make sure that javascript_include_tag/stylesheet_link_tag methods in | Jorge Bejar | 2012-05-03 | 1 | -0/+6 |
| | | | | | | | | sprockets/helpers/rails_helper.rb discard duplicated assets | ||||
* | | Add failing test re #3436 which demonstrates content_type is not respected ↵ | Kunal Shah | 2012-05-07 | 1 | -0/+21 |
| | | | | | | | | when using the :head method/shortcut | ||||
* | | Add a role option to wrap_parameters. | Nick Ragaz | 2012-05-04 | 1 | -2/+15 |
|/ | | | | The role option identifies which parameters are accessible and should be wrapped. The default role is :default. | ||||
* | 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 |
| | |