Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1552 from bogdan/select | Piotr Sarnacki | 2011-06-11 | 1 | -6/+37 |
|\ | | | | | Fixing select[multiple] html specification problem. | ||||
| * | Fixing select[multiple] html specification problem. | Bogdan Gusiev | 2011-06-08 | 1 | -6/+37 |
| | | | | | | | | Generating hidden input with same name before each multiple select | ||||
* | | No need for a configuration option here. | José Valim | 2011-06-11 | 1 | -10/+2 |
| | | |||||
* | | Remove utf8_enforcer_param config option | David Lee | 2011-06-11 | 1 | -7/+0 |
| | | |||||
* | | Make utf8_enforcer_tag an overrideable method | David Lee | 2011-06-11 | 1 | -3/+7 |
| | | |||||
* | | Make utf8 enforcer param customizeable | David Lee | 2011-06-11 | 3 | -4/+18 |
| | | |||||
* | | There are no snowmen here | David Lee | 2011-06-11 | 1 | -3/+3 |
| | | |||||
* | | Revert "Make sure that we don't perform in-place mutation on SafeBuffer string" | Santiago Pastorino and José Ignacio Costa | 2011-06-10 | 1 | -3/+0 |
| | | | | | | | | This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1. | ||||
* | | Make sure that we don't perform in-place mutation on SafeBuffer string | Prem Sichanugrist | 2011-06-10 | 1 | -0/+3 |
| | | | | | | | | | | | | This will make sure `render :inline` is working. Closes #1633 | ||||
* | | Ensure number helpers can handle HTML safe strings - closes #1597. | Andrew White | 2011-06-10 | 1 | -1/+1 |
| | | |||||
* | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵ | Prem Sichanugrist | 2011-06-09 | 1 | -1/+2 |
| | | | | | | | | is already html_safe | ||||
* | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 1 | -1/+1 |
|/ | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block | ||||
* | Merge pull request #1547 from sikachu/safebuffer | José Valim | 2011-06-07 | 2 | -5/+9 |
|\ | | | | | Fix ActionPack tests on `master` | ||||
| * | Add proper fix to `mail_to` helper. | Prem Sichanugrist | 2011-06-08 | 1 | -2/+2 |
| | | | | | | | | | | * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer` * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior. | ||||
| * | Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform ↵ | Prem Sichanugrist | 2011-06-08 | 1 | -3/+7 |
| | | | | | | | | | | | | cloning before manipulation only on `OutputBuffer`. After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost. | ||||
* | | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer | José Valim | 2011-06-07 | 1 | -1/+2 |
|\ \ | |/ |/| | Don't operate on the safebuffer, operate on a string and convert. | ||||
| * | Don't operate on the safebuffer, operate on a string and convert. | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+2 |
| | | |||||
* | | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 3 | -3/+2 |
| | | |||||
* | | Fragment caching needs to operate on the pure output, not the | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+3 |
|/ | | | | safebuffer. | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 6 | -8/+8 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 4 | -5/+5 |
| | | |||||
| * | The example in the API docs incorrectly indicated that form_for would use ↵ | Mark Roghelia | 2011-05-31 | 1 | -2/+2 |
| | | | | | | | | the same default route for both new and previously persisted records. The default path given in the example would have generated a routing error for new records. form_for actually uses polymorphic_path to determine which route to use based on the state of the record. The example has been updated to reflect the method's actual behavior. | ||||
| * | Added missing quote in grouped_options_for_select example | diego | 2011-05-26 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1448 from ernie/attr_internal_require | José Valim | 2011-06-01 | 1 | -0/+2 |
|\ \ | | | | | | | Require attr_internal before using in ActionView::Helpers | ||||
| * | | Require attr_internal before using in ActionView::Helpers | Ernie Miller | 2011-06-01 | 1 | -0/+2 |
| | | | |||||
* | | | fixed asset_paths when called from sprockets for relative_url_root | jacott | 2011-05-28 | 2 | -11/+7 |
| | | | |||||
* | | | Merge pull request #1311 from kuldarkrabbi/master | José Valim | 2011-05-25 | 1 | -1/+0 |
|\ \ \ | |_|/ |/| | | action_view/template/handler.rb has been removed | ||||
| * | | action_view/template/handler has been removed | Kuldar Krabbi | 2011-05-25 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 8 | -22/+22 |
|\ \ \ | |/ / |/| | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| * | | Remove extra white spaces on ActionPack docs. | Sebastian Martinez | 2011-05-23 | 8 | -22/+22 |
| | | | |||||
* | | | corrected the ActionMailer tests which broke due to some code removed from ↵ | Josh Kalderimis | 2011-05-25 | 1 | -0/+1 |
| | | | | | | | | | | | | ActionPack | ||||
* | | | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 4 | -62/+0 |
| | | | |||||
* | | | Redundant condition in compute_asset_host is redundant. | Ernie Miller | 2011-05-24 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Remaining cleanup from changes to AssetTagHelper | tomhuda | 2011-05-24 | 2 | -12/+4 |
| | | |||||
* | | Move the last pockets of Sprockets stuff into the Sprockets directory | wycats | 2011-05-23 | 2 | -16/+0 |
| | | |||||
* | | Move javascript/css helpers into the Sprockets helper and just have them ↵ | wycats | 2011-05-23 | 1 | -43/+0 |
| | | | | | | | | override the old behavior | ||||
* | | Start moving some logic from being embedded in AV into the Rails Sprockets ↵ | wycats | 2011-05-23 | 2 | -62/+6 |
| | | | | | | | | extensions | ||||
* | | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 1 | -15/+47 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | ||||
| * | | Add debug_asset support | Joshua Peek | 2011-05-22 | 1 | -15/+47 |
| | | | |||||
* | | | Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub | José Valim | 2011-05-22 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920 | José Valim | 2011-05-22 | 1 | -0/+19 |
|\ \ \ | |/ / |/| | | Add method FormHelper#fields_for_with_index | ||||
| * | | Add method fields_for_with_index to FormHelper | Jorge Bejar | 2011-05-21 | 1 | -0/+19 |
| | | | |||||
* | | | fixed some ruby 19 warnings, including circular requires and variable name reuse | Josh Kalderimis | 2011-05-21 | 2 | -2/+0 |
|/ / | |||||
* / | Example Usage updated for actionpack and actionmailer. | Arun Agrawal | 2011-05-19 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #568 from carlosantoniodasilva/fields_for_fixes | José Valim | 2011-05-15 | 1 | -36/+26 |
|\ | | | | | Fields for fixes for non nested attributes and without object | ||||
| * | Use record_name to make fields for methods more consistent | Carlos Antonio da Silva | 2011-05-14 | 1 | -6/+6 |
| | | |||||
| * | Refactor fields_for to make the api more clear, and fix usage with non ↵ | Carlos Antonio da Silva | 2011-05-14 | 1 | -26/+19 |
| | | | | | | | | nested attributes and without object | ||||
| * | Cleanup instantiate builder method definition | Carlos Antonio da Silva | 2011-05-14 | 1 | -5/+2 |
| | | |||||
* | | Clean up redundant backslashes | Pirogov Evgenij | 2011-05-14 | 1 | -4/+4 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 9 | -94/+101 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt |