Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' | wycats | 2010-05-17 | 1 | -2/+5 |
|\ | |||||
| * | Added default currency values to NumberHelper and pass them to I18n.translate | Santiago Pastorino | 2010-05-17 | 1 | -2/+5 |
| | | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Moved encoding work in progress to a feature branch. | Jeremy Kemper | 2010-05-16 | 4 | -284/+71 |
| | | | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c. | ||||
* | | Make sure encoding changes don't break 1.8 | wycats | 2010-05-17 | 1 | -1/+3 |
|/ | |||||
* | Significantly improved internal encoding heuristics and support. | wycats | 2010-05-16 | 4 | -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 templates | wycats | 2010-05-16 | 2 | -45/+59 |
| | |||||
* | Check blocks are not incorrectly detected when compiling erubis templates ↵ | Simon Jefford | 2010-05-16 | 1 | -1/+1 |
| | | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | added support for html attributes in options_for_select [#2165] | pleax | 2010-05-16 | 1 | -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 Dean | 2010-05-15 | 1 | -5/+11 |
| | | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Optimize the code added in fa99de0bd054576336c9 | José Valim | 2010-05-15 | 1 | -9/+19 |
| | |||||
* | make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵ | Jeff Kreeftmeijer | 2010-05-15 | 1 | -1/+1 |
| | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | partial counters with :as [#2804 state:resolved] | Jeff Kreeftmeijer | 2010-05-15 | 1 | -0/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Accept :alt => nil on image_tag [#4558 state:resolved] | Marc-Andre Lafortune | 2010-05-15 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Improve previous patch a bit [#3645 state:resolved] | José Valim | 2010-05-15 | 2 | -9/+6 |
| | |||||
* | Let label helpers accept blocks. | Stephen Celis | 2010-05-15 | 2 | -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é Valim | 2010-05-09 | 1 | -3/+2 |
| | | | | exceptions middleware. | ||||
* | Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax ↵ | Lawrence Pit | 2010-05-03 | 1 | -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é Valim | 2010-05-03 | 1 | -26/+6 |
| | | | | rarely showed the full trace. Also, increase performance considerably. | ||||
* | add NullResolver | David Chelimsky | 2010-05-02 | 1 | -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 tests | David Chelimsky | 2010-05-02 | 1 | -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 George | 2010-05-02 | 3 | -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é Valim | 2010-05-01 | 1 | -7/+3 |
| | |||||
* | Use %{} syntax in I18n (faster) instead of {{}}. | José Valim | 2010-05-01 | 2 | -17/+17 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-30 | 3 | -47/+36 |
|\ | |||||
| * | removing the extra assignment statement [#4432 state:resolved] | Neeraj Singh | 2010-04-30 | 1 | -1/+0 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fix form builder and form helpers inconsistencies [#4432 state:resolved] | Neeraj Singh | 2010-04-29 | 1 | -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 regexp | Jeremy Kemper | 2010-04-27 | 1 | -1/+1 |
| | | |||||
| * | Only run load hooks once a file has been fully loaded. | Nathan Weizenbaum | 2010-04-27 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-26 | 3 | -3/+3 |
|\| | |||||
| * | Rename fieldWithErrors style to field_with_errors. Remove unused alert style. | Jeremy Kemper | 2010-04-24 | 1 | -1/+1 |
| | | |||||
| * | HWIA symbolize_keys now returns a hash so no need to do this anymore | Santiago Pastorino | 2010-04-22 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Clean up the config object in ActionPack. Create config_accessor which just ↵ | José Valim | 2010-04-22 | 1 | -1/+1 |
| | | | | | | | | delegates to the config object, reducing the number of deprecations and add specific tests. | ||||
* | | Allow :remote => false to be passed to link_to | Nicolas Sanguinetti | 2010-04-22 | 1 | -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 Pastorino | 2010-04-21 | 1 | -1/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge remote branch 'spastorino/master' | Carl Lerche | 2010-04-18 | 1 | -1/+1 |
|\ | |||||
| * | perform_caching should be accessed through the controller here | Santiago Pastorino | 2010-04-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | Carl Lerche | 2010-04-18 | 1 | -0/+1 |
|\| | |||||
| * | Missing requires | wycats | 2010-04-16 | 1 | -0/+1 |
| | | |||||
* | | mail_to with :encode => :javascript now outputs safe html | Sam Elliott | 2010-04-16 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Mark the result of grouped_options_for_select as HTML safe [#4322 ↵ | Kieran Pilkington | 2010-04-16 | 1 | -1/+1 |
| | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Make perform_caching work again, with the tests passing and backward compatible | Santiago Pastorino and Carl Lerche | 2010-04-15 | 1 | -1/+1 |
| | |||||
* | Make use of config.perform_caching | Santiago Pastorino | 2010-04-14 | 1 | -1/+1 |
| | |||||
* | Changed translate helper so that it doesn’t mark every translation as safe ↵ | Craig Davey | 2010-04-13 | 1 | -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 Webster | 2010-04-12 | 1 | -1/+1 |
| | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Let capture handle the yielding. | José Valim | 2010-04-12 | 1 | -4/+1 |
| | |||||
* | Fix ActionMailer test broken in 99d54599215c2a8cea7e57f609e8e578043d71b2 | José Valim | 2010-04-12 | 1 | -3/+10 |
| | |||||
* | fields_for returns block result when outside ERB | Ryan Bates | 2010-04-11 | 1 | -1/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | your beloved typo only spotted in github diff no matter how careful you were ↵ | Xavier Noria | 2010-04-11 | 1 | -1/+1 |
| | | | | before pushing | ||||
* | second pass to the intro rdoc of form_helper.rb | Xavier Noria | 2010-04-11 | 1 | -13/+55 |
| | |||||
* | removes some duplication in previous edit | Xavier Noria | 2010-04-10 | 1 | -5/+0 |
| |