aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-164-284/+71
| | | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
* | Make sure encoding changes don't break 1.8wycats2010-05-171-1/+3
|/
* Significantly improved internal encoding heuristics and support.wycats2010-05-164-35/+234
| | | | | | | | | | | | | | | | | | | | | | | | | * Default Encoding.default_internal to UTF-8 * Eliminated the use of file-wide magic comments to coerce code evaluated inside the file * Read templates as BINARY, use default_external or template-wide magic comments inside the Template to set the initial encoding * This means that template handlers in Ruby 1.9 will receive Strings encoded in default_internal (UTF-8 by default) * Create a better Exception for encoding issues, and use it when the template source has bytes that are not compatible with the specified encoding * Allow template handlers to opt-into handling BINARY. If they do so, they need to do some of their own manual encoding work * Added a "Configuration Gotchas" section to the intro Rails Guide instructing users to use UTF-8 for everything * Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid $KCODE value is used Also: * Fixed a few tests that were assert() rather than assert_equal() and were caught by Minitest requiring a String for the message * Fixed a test where an assert_select was misformed, also caught by Minitest being more restrictive * Fixed a test where a Rack response was returning a String rather than an Enumerable
* Initial work to improve the state of encodings for templateswycats2010-05-162-45/+59
|
* Check blocks are not incorrectly detected when compiling erubis templates ↵Simon Jefford2010-05-161-1/+1
| | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* added support for html attributes in options_for_select [#2165]pleax2010-05-161-2/+25
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Sending :id => nil to form helpers now properly omits the "id" html element ↵Jeff Dean2010-05-151-5/+11
| | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Optimize the code added in fa99de0bd054576336c9José Valim2010-05-151-9/+19
|
* make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵Jeff Kreeftmeijer2010-05-151-1/+1
| | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* partial counters with :as [#2804 state:resolved]Jeff Kreeftmeijer2010-05-151-0/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Accept :alt => nil on image_tag [#4558 state:resolved]Marc-Andre Lafortune2010-05-151-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Improve previous patch a bit [#3645 state:resolved]José Valim2010-05-152-9/+6
|
* Let label helpers accept blocks.Stephen Celis2010-05-152-18/+40
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Use annoted source code in Template:Error to avoid special cases in the show ↵José Valim2010-05-091-3/+2
| | | | exceptions middleware.
* Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax ↵Lawrence Pit2010-05-031-1/+1
| | | | | | for I18n Signed-off-by: José Valim <jose.valim@gmail.com>
* Make backtrace_cleaner work as expected. Prior to this patch, the Full Trace ↵José Valim2010-05-031-26/+6
| | | | rarely showed the full trace. Also, increase performance considerably.
* add NullResolverDavid Chelimsky2010-05-021-0/+8
| | | | | | [#4523 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* move FixtureResolver to a file that is accessible outside Rails' own testsDavid Chelimsky2010-05-021-0/+35
| | | | | | [#4522 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Change event namespace ordering to most-significant first [#4504 state:resolved]Justin George2010-05-023-4/+4
| | | | | | | | | More work still needs to be done on some of these names (render_template.action_view and render_template!.action_view particularly) but this allows (for example) /^sql/ to subscribe to all the various ORMs without further modification Signed-off-by: José Valim <jose.valim@gmail.com>
* Speed up I18n helpers in views and add entry to CHANGELOG.José Valim2010-05-011-7/+3
|
* Use %{} syntax in I18n (faster) instead of {{}}.José Valim2010-05-012-17/+17
|
* Merge branch 'master' of github.com:rails/railswycats2010-04-303-47/+36
|\
| * removing the extra assignment statement [#4432 state:resolved]Neeraj Singh2010-04-301-1/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fix form builder and form helpers inconsistencies [#4432 state:resolved]Neeraj Singh2010-04-291-43/+33
| | | | | | | | | | | | | | | | * datetime_select and select_datetime should be consistent as much as possible * date_select and select_date should be consistent as much as possible * time_select and select_time should be consistent as much as possible Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fix prototype grep depending on JSON encoding regexp as JavaScript regexpJeremy Kemper2010-04-271-1/+1
| |
| * Only run load hooks once a file has been fully loaded.Nathan Weizenbaum2010-04-271-2/+2
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge branch 'master' of github.com:rails/railswycats2010-04-263-3/+3
|\|
| * Rename fieldWithErrors style to field_with_errors. Remove unused alert style.Jeremy Kemper2010-04-241-1/+1
| |
| * HWIA symbolize_keys now returns a hash so no need to do this anymoreSantiago Pastorino2010-04-221-1/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Clean up the config object in ActionPack. Create config_accessor which just ↵José Valim2010-04-221-1/+1
| | | | | | | | delegates to the config object, reducing the number of deprecations and add specific tests.
* | Allow :remote => false to be passed to link_toNicolas Sanguinetti2010-04-221-3/+1
|/ | | | | | | And add tests for `button_to` and `form_tag` which currently behave as expected, so we avoid a regression. Signed-off-by: wycats <wycats@gmail.com>
* url_for now works with HashWithIndifferentAccess ht jay [#4391 state:committed]Santiago Pastorino2010-04-211-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge remote branch 'spastorino/master'Carl Lerche2010-04-181-1/+1
|\
| * perform_caching should be accessed through the controller hereSantiago Pastorino2010-04-171-1/+1
| |
* | Merge branch 'master' of github.com:rails/railsCarl Lerche2010-04-181-0/+1
|\|
| * Missing requireswycats2010-04-161-0/+1
| |
* | mail_to with :encode => :javascript now outputs safe htmlSam Elliott2010-04-161-1/+1
|/ | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* Mark the result of grouped_options_for_select as HTML safe [#4322 ↵Kieran Pilkington2010-04-161-1/+1
| | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com>
* Make perform_caching work again, with the tests passing and backward compatibleSantiago Pastorino and Carl Lerche2010-04-151-1/+1
|
* Make use of config.perform_cachingSantiago Pastorino2010-04-141-1/+1
|
* Changed translate helper so that it doesn’t mark every translation as safe ↵Craig Davey2010-04-131-3/+23
| | | | | | HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Fix a typo in the documentation. [#4318 state:resolved]Craig R Webster2010-04-121-1/+1
| | | Signed-off-by: wycats <wycats@gmail.com>
* Let capture handle the yielding.José Valim2010-04-121-4/+1
|
* Fix ActionMailer test broken in 99d54599215c2a8cea7e57f609e8e578043d71b2José Valim2010-04-121-3/+10
|
* fields_for returns block result when outside ERBRyan Bates2010-04-111-1/+1
| | | | Signed-off-by: wycats <wycats@gmail.com>
* your beloved typo only spotted in github diff no matter how careful you were ↵Xavier Noria2010-04-111-1/+1
| | | | before pushing
* second pass to the intro rdoc of form_helper.rbXavier Noria2010-04-111-13/+55
|
* removes some duplication in previous editXavier Noria2010-04-101-5/+0
|