Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use to_model delegates for polymorphic route generation | Nathaniel Bibler | 2012-06-01 | 1 | -1/+7 |
| | |||||
* | bumping to 3.2.5 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | bumping to 3.2.4 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | Strip [nil] from parameters hash. | Aaron Patterson | 2012-05-30 | 1 | -0/+22 |
| | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660 | ||||
* | bumping to 3.2.4.rc1 | Aaron Patterson | 2012-05-28 | 1 | -2/+2 |
| | |||||
* | remove unnecessary memcache equire in ActionDispatch::Session::CacheStore | Brian Durand | 2012-05-26 | 1 | -1/+0 |
| | |||||
* | Assets: don't add extension if other given and file exists | Sergey Nartimov | 2012-05-21 | 1 | -2/+7 |
| | | | | | | | | | | | | | | 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 | ||||
* | Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable | Rafael Mendonça França | 2012-05-20 | 1 | -1/+1 |
|\ | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | ||||
| * | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-20 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c | José Valim | 2012-05-20 | 1 | -10/+22 |
|\ \ | |/ |/| | Template concurrency fixes | ||||
| * | Prevent concurrent compilation of templates - closes #6400 | Tom Clarke | 2012-05-20 | 1 | -10/+22 |
| | | |||||
* | | Use right option for excerpt text helper in tests, fix build | Carlos Antonio da Silva | 2012-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | `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 | -2/+2 |
| | | | | | | | | 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 | -0/+9 |
| | | |||||
* | | Deprecate `:disable_with` for `button_tag` too | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -2/+4 |
| | | |||||
* | | Fix typo | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 1 | -1/+1 |
| | | |||||
* | | Deprecate `:disable_with` in favor of `'data-disable-with'` option for ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -6/+13 |
| | | | | | | | | `button_to` and `submit_tag` helpers. | ||||
* | | Deprecate `:mouseover` options for `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 2 | -2/+2 |
| | | | | | | | | Support data: url scheme | ||||
* | | Don't ignore nil positional arguments for url helpers - fixes #6196. | Andrew White | 2012-05-10 | 1 | -1/+1 |
| | | |||||
* | | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 1 | -7/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | -2/+2 |
|\ \ | | | | | | | 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 | -2/+2 |
| | | | | | | | | | | | | sprockets/helpers/rails_helper.rb discard duplicated assets | ||||
* | | | If content_type is explicitly passed to the :head method use the value or ↵ | Kunal Shah | 2012-05-07 | 1 | -1/+2 |
| | | | | | | | | | | | | fallback | ||||
* | | | Add a role option to wrap_parameters. | Nick Ragaz | 2012-05-04 | 1 | -2/+3 |
|/ / | | | | | | | 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 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
* | | Fix #3993 assets:precompile task does not detect index files | Dmitry Vorotilin | 2012-05-01 | 1 | -0/+3 |
| | | |||||
* | | fix the Flash middleware loading the session on every request (very ↵ | Will Bryant | 2012-04-30 | 2 | -7/+3 |
| | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called | ||||
* | | Add note about using 303 See Other for XHR requests other than GET/POST | Andrew White | 2012-04-30 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE since version 6 and recently Chrome and Firefox have started following 302 redirects from XHR requests other than GET/POST using the original request method. This can lead to DELETE requests being redirected amongst other things. Although it doesn't directly affect the Rails framework since it doesn't return a 302 redirect to any non-GET/POST request a note has been added to raise awareness of the issue. Some references: Original article from @technoweenie: http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/ Hacker News discussion of the article: http://news.ycombinator.com/item?id=2903493 WebKit bug report: https://bugs.webkit.org/show_bug.cgi?id=46183 Firefox bug report and changeset: https://bugzilla.mozilla.org/show_bug.cgi?id=598304 https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d Chrome bug report: http://code.google.com/p/chromium/issues/detail?id=56373 HTTPbis bug report and changeset: http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160 http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428 Roy T. Fielding's history of the issue: http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html Automated browser tests for the issue: http://www.mnot.net/javascript/xmlhttprequest/ Fixes #4144 (cherry picked from commit 24f143789a8989f3bccde14ff28067de25cafd87) | ||||
* | | Deprecate link_to_function and button_to_function helpers | Rafael Mendonça França | 2012-04-30 | 1 | -0/+4 |
| | | |||||
* | | Add missing require when helpers are used in isolation | Rafael Mendonça França | 2012-04-30 | 1 | -0/+1 |
| | | |||||
* | | Restore interpolation of path option in redirect routes | Andrew White | 2012-04-29 | 1 | -0/+10 |
| | | |||||
* | | Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3 | Andrew White | 2012-04-29 | 1 | -0/+1 |
| | | |||||
* | | Escape interpolated params when redirecting - fixes #5688 | Andrew White | 2012-04-29 | 1 | -1/+6 |
| | | |||||
* | | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 1 | -6/+18 |
| | | | | | | | | | | | | | | | | (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 | -1/+7 |
| | | | | | | | | closes #3341 | ||||
* | | Do not mutate options hash | Carlos Antonio da Silva | 2012-04-27 | 1 | -2/+2 |
| | | |||||
* | | fix number_to_human docs [ci skip] | Vijay Dev | 2012-04-26 | 1 | -2/+2 |
| | | |||||
* | | converting some tests to assert_raises, and DRY'ing retrieve_variable changes | Tieg Zaharia | 2012-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | 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 | -1/+1 |
| | | |||||
* | | Fix the redirect when it receive blocks with arity of 1. | Rafael Mendonça França | 2012-03-31 | 1 | -1/+2 |
| | | | | | | | | Closes #5677 | ||||
* | | Merge branch '3-2-3' into 3-2-stable | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bump up to 3.2.3 | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 1 | -0/+1 |
| |/ | |||||
| * | Bumping to 3.2.3.rc2 | Santiago Pastorino | 2012-03-29 | 1 | -1/+1 |
| | | |||||
| * | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 |
| | | | | | | | | Closes #5632 | ||||
| * | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 1 | -1/+1 |
| | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | ||||
| * | Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms | Santiago Pastorino | 2012-03-28 | 2 | -8/+24 |
| | | | | | | | | Embed auth token in remote forms | ||||
| * | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml | Santiago Pastorino | 2012-03-27 | 2 | -2/+6 |
| | | | | | | | | Textarea newline fix breaks haml (3-2-stable) | ||||
* | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 1 | -0/+1 |
| | |