Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+1 |
| | | |||||
* | | 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 | 3 | -4/+4 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 1 | -1/+1 |
| | | |||||
| * | 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 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 |
| | | | |||||
* | | | 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 | 1 | -14/+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 | 1 | -1/+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 | 7 | -84/+91 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| * | Follow code conventions on docs | Sebastian Martinez | 2011-05-10 | 1 | -2/+2 |
| | | |||||
| * | Fix styiling issues on DateHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -64/+70 |
| | | |||||
| * | Fix styiling issues on AtomFeedHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -4/+4 |
| | | |||||
| * | Remove extra whitespace. | Sebastian Martinez | 2011-05-10 | 1 | -1/+1 |
| | | |||||
| * | Fix styiling issue on TranslationHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -4/+4 |
| | | |||||
| * | Explain the implication of using :ignore_date on time_select | Aditya Sanghi | 2011-05-10 | 1 | -1/+2 |
| | | |||||
| * | Fixed typos in documentation for the date_select helper in ↵ | Philip Roberts | 2011-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | actionpack/action_view. The description for an example of the date_select method did not match the actual code example. | ||||
| * | Documentation fix. Corrected a copy/paste mistake for link_to_if documentation. | Ryan Sandridge | 2011-05-08 | 1 | -1/+1 |
| | | |||||
| * | Fixed documentation of select tag; options with html need to pass through ↵ | Jason | 2011-05-08 | 1 | -6/+6 |
| | | | | | | | | | | | | html_safe https://github.com/rails/rails/issues/447 https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6759-api-document-incorrect | ||||
* | | Add tests for content_for() for read, closes #475. | José Valim | 2011-05-10 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #343 from asanghi/ampm | José Valim | 2011-05-07 | 1 | -4/+30 |
|\ \ | | | | | | | Allow AM/PM format in datetime selectors | ||||
| * | | DRY this baby up | Aditya Sanghi | 2011-04-29 | 1 | -23/+4 |
| | | | |||||
| * | | add more documentation; remove unused assignment | Aditya Sanghi | 2011-04-29 | 1 | -4/+14 |
| | | |