aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* truncate() should not try to produce HTML-safe outputWincent Colaiuta2010-06-171-8/+4
| | | | | | | | | | As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate() method cannot guarantee safe output for all possible inputs/offsets, so it is best to leave the output unsafe so that it gets escaped when used in a view. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-143-5/+5
| | | | not "ActiveRecord"
* truncate safe method description changesNeeraj Singh2010-06-141-1/+1
|
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-06-142-2/+2
|\
| * render(:inline) in a layout before yield replaces original contentNeeraj Singh2010-06-131-1/+1
| | | | | | | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * removes spurious .rb in requireXavier Noria2010-06-121-1/+1
| |
* | truncate documentation an examples added for :safe optionSantiago Pastorino2010-06-131-0/+10
|/
* Merge remote branch 'docrails/master'Xavier Noria2010-06-121-1/+9
|\
| * adds missing require for having ActiveSupport::InheritableOptions definedXavier Noria2010-06-111-0/+1
| |
| * Updated all number helpers with :locale option.Slobodan Kovacevic2010-06-111-1/+9
| |
* | text_helper now escape the unsafe input instead of sanitizingSantiago Pastorino2010-06-111-4/+4
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | adds missing require for having ActiveSupport::InheritableOptions definedXavier Noria2010-06-111-0/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-06-103-105/+15
|\
| * Remove punctuate_body! No code in lib was using it and it had no documentation.José Valim2010-06-101-6/+0
| |
| * class_attribute is not a direct replacement of class_inheritable_*.José Valim2010-06-101-10/+7
| | | | | | | | | | | | If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance.
| * Removed textilize, textilize_without_paragraph and markdown helpersSantiago Pastorino2010-06-091-83/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Memoize the object returned by _view in ActionView::TestCase::BehaviorDavid Chelimsky2010-06-081-6/+8
| | | | | | | | | | | | [#4799 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Added :locale option explanation for number_to_currencySlobodan Kovacevic2010-06-101-0/+2
|/
* Fixed double output from cache in no caching modeDavid Heinemeier Hansson2010-06-081-14/+14
|
* Made markdown honor :safe option and handle safe input. Also added tests for ↵rohit2010-06-081-2/+2
| | | | | | | | markdown. [#4794 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fixed textilize_without_paragraph and added tests for it. [#4792 state:resolved]rohit2010-06-081-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Updating image_tag to support cid:content_id "URLs"Mikel Lindsaar2010-06-071-2/+5
|
* Fix case when rendering a partial inside RJS with inherited layout [#4786 ↵José Valim2010-06-071-1/+1
| | | | state:resolved]
* Makes text_helper methods sanitize the input if the input is not safe or ↵Santiago Pastorino2010-06-071-16/+22
| | | | :safe => true option is not provided
* content_tag_string shouldn't escape_html if escape param is falseSantiago Pastorino2010-06-071-1/+1
|
* Make AP test suite green once again and speed up performance in layouts ↵José Valim2010-06-073-31/+37
| | | | lookup for some cases.
* Formats should always be an array.Jeremy Kemper2010-06-061-1/+1
|
* Optimize LookupContextwycats2010-06-043-11/+27
|
* Changes made while working on upgrading cells to Rails 3wycats2010-06-021-0/+1
|
* revises the documentation of String#truncate and the truncate helperXavier Noria2010-06-021-9/+9
|
* Extracted String#truncate from TextHelper#truncate [DHH]David Heinemeier Hansson2010-06-011-11/+5
|
* Base options cant live in lazy loaded helpers as they then wont be available ↵David Heinemeier Hansson2010-05-312-7/+4
| | | | to set for config
* Update template to allow handlers to more cleanly handle encodings (ht: nex3)wycats2010-05-303-65/+65
|
* Merge commit 'mislav/auto_link'Michael Koziarski2010-05-291-12/+21
|\
| * avoid auto_linking already linked emails; more robust detection of linked URLsMislav Marohnić2010-05-241-9/+18
| | | | | | | | | | | | | | | | | | | | References #1523 [#1862 state:resolved] [#3591 state:resolved] Add test that shows how link text can contain HTML if needed: the trick is using block form in combination with `raw`. Let link text be automatically HTML-escaped [#2017 state:resolved]
| * auto_link: support arbitrary URI schemes like "ftp:" and "file:"Mislav Marohnić2010-05-241-3/+3
| | | | | | | | | | | | recognizes all URI scheme allowed characters, such as colon and period. [#3494 state:resolved]
* | In AV::TC, move protect_against_forgery? from the test_case to theDavid Chelimsky2010-05-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | _helper module included in the view. - ensures that protect_against_forgery? is present when a helper included in a partial that is rendered by the template under test calls it (which happens in FormTagHelper#extra_tags_for_form, for example). [#4700 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Support configuration of controller.controller_path on instances ofDavid Chelimsky2010-05-261-2/+7
| | | | | | | | | | | | | | | | | | | | ActionView::TestCase::TestController without stubs. Just say: @controller.controller_path = "path/i/need/for/this/test" [#4697 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | i18n: t() handles single keys returning an Array, alsoJeremy Kemper2010-05-241-2/+5
| |
* | HTML safety: fix textarea with nil contentJeremy Kemper2010-05-241-1/+1
| |
* | translate method doesn't support arrays anymore and is optimized to be used ↵Santiago Pastorino2010-05-241-18/+10
| | | | | | | | | | | | with strings or symbols Signed-off-by: José Valim <jose.valim@gmail.com>
* | Revert "translation method for arrays on TranslationHelper module returns an ↵Santiago Pastorino2010-05-241-25/+25
| | | | | | | | | | | | | | | | array where values for keys of the form (.|_)html keys are html_safe" This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Move AV::TC to AV::TC::Behavior [#4678 state:resolved]David Chelimsky2010-05-241-65/+85
| | | | | | | | | | | | | | | | | | | | | | | | - enables alternative testing frameworks to include AV::TC::Behavior instead of subclassing AV::TC - also added tests and code for: - test view delegates :notice to request.flash - useful since generators generate views that use notice - test case doesn't try to include modules that are actually classes Signed-off-by: José Valim <jose.valim@gmail.com>
* | translation method for arrays on TranslationHelper module returns an array ↵Santiago Pastorino2010-05-241-25/+25
|/ | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com>
* refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-203-5/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-05-196-74/+293
|\
| * Avoid instance variable @output_buffer not initializedSantiago Pastorino2010-05-191-1/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Merge remote branch 'origin/master'wycats2010-05-171-2/+5
| |\
| | * Added default currency values to NumberHelper and pass them to I18n.translateSantiago Pastorino2010-05-171-2/+5
| | | | | | | | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Make sure encoding changes don't break 1.8wycats2010-05-171-1/+3
| | |