Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Show in log correct wrapped keys | Dmitry Vorotilin | 2012-07-05 | 1 | -0/+8 |
| | |||||
* | Merge pull request #6649 from route/logger_in_metal_3_2 | Carlos Antonio da Silva | 2012-06-18 | 1 | -0/+17 |
|\ | | | | | Logger in metal backport for 3.2 | ||||
| * | Added test for case when view doesn't have logger method when using ↵ | Dmitry Vorotilin | 2012-06-16 | 1 | -0/+17 |
| | | | | | | | | ActionController::Metal controller. | ||||
* | | It should also include text/css => Build Fix | Arun Agrawal | 2012-06-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #6752 from steveklabnik/fix_5680 | Rafael Mendonça França | 2012-06-16 | 2 | -3/+14 |
|/ | | | | Respect absolute paths in compute_source_path. | ||||
* | adding a test for #6459 | Aaron Patterson | 2012-06-14 | 1 | -0/+10 |
| | |||||
* | ActionController::Caching depends on RackDelegation and ↵ | Santiago Pastorino | 2012-06-13 | 1 | -0/+32 |
| | | | | AbstractController::Callbacks | ||||
* | Array parameters should not contain nil values. | Aaron Patterson | 2012-06-11 | 1 | -0/+4 |
| | |||||
* | Duplicate tests removed. | Arun Agrawal | 2012-06-09 | 1 | -16/+0 |
| | |||||
* | Fix asset tags for files with more than one dot | Piotr Sarnacki | 2012-06-07 | 3 | -0/+6 |
| | | | | | | | | | | | | | | | After the fix done in 39f9f02a, there are cases that will not work correctly. If you have file with "2 extensions", like foo.min.js and you reference the file without extension, like: javascript_include_tag "foo.min" it will fail because sprockets finds foo.min.js with foo.min argument. This commit fixes this case and will get the right file even when referrencing it without extension. (closes #6598) | ||||
* | Add test to flash sweep after two redirects | Rafael Mendonça França | 2012-06-05 | 1 | -0/+20 |
| | | | | | This test is needed to avoid regressions in the way that flash works now (swept in every request). | ||||
* | Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option | Carlos Galdino | 2012-06-05 | 2 | -19/+110 |
| | | | | | | | | | | | | This deprecation applies to: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` As :confirm is an UI specific option is better to use the data attributes, teaching users about unobtrusive JavaScript and how Rails works with it. | ||||
* | Allow to use mounted helpers in ActionView::TestCase | Piotr Sarnacki | 2012-06-01 | 2 | -0/+20 |
| | | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase | ||||
* | Merge pull request #6588 from nbibler/polymorphic_to_model | José Valim | 2012-06-01 | 1 | -1/+27 |
|\ | | | | | Correct the use of to_model in polymorphic routing | ||||
| * | Use to_model delegates for polymorphic route generation | Nathaniel Bibler | 2012-06-01 | 1 | -1/+27 |
| | | |||||
* | | Include routes.mounted_helpers into integration tests | Piotr Sarnacki | 2012-06-01 | 1 | -0/+19 |
|/ | | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573) | ||||
* | 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. |