Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote branch 'origin/master' | wycats | 2010-05-17 | 2 | -1/+28 | |
|\ | ||||||
| * | Added default currency values to NumberHelper and pass them to I18n.translate | Santiago Pastorino | 2010-05-17 | 1 | -0/+17 | |
| | | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Allow root to be given in the resources scope without need to specify :on => ↵ | José Valim | 2010-05-17 | 1 | -1/+11 | |
| | | | | | | | | collection. | |||||
| * | Moved encoding work in progress to a feature branch. | Jeremy Kemper | 2010-05-16 | 10 | -146/+15 | |
| | | | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c. | |||||
* | | Make sure encoding changes don't break 1.8 | wycats | 2010-05-17 | 1 | -4/+6 | |
|/ | ||||||
* | Significantly improved internal encoding heuristics and support. | wycats | 2010-05-16 | 10 | -15/+146 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | |||||
* | Check blocks are not incorrectly detected when compiling erubis templates ↵ | Simon Jefford | 2010-05-16 | 2 | -0/+6 | |
| | | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Fixed 1 failure in ActionPack testsuite [#4613 state:resolved] | Hussein Morsy | 2010-05-16 | 1 | -2/+2 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | added support for html attributes in options_for_select [#2165] | pleax | 2010-05-16 | 1 | -0/+56 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Fixed 1 failure and 2 errors in ActionPack testsuite [#4613 state:commited] | rohit | 2010-05-16 | 3 | -6/+6 | |
| | | | | 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 | -0/+107 | |
| | | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Ruby 1.9: fix invalid rack response in test | Jeremy Kemper | 2010-05-15 | 1 | -1/+1 | |
| | ||||||
* | partial counters with :as [#2804 state:resolved] | Jeff Kreeftmeijer | 2010-05-15 | 2 | -0/+10 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Add tests for convenience methods #notice and #alert to flash.now [#4369 ↵ | Anil Wadghule | 2010-05-15 | 1 | -0/+20 | |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | fix assert_select messages to its declaration behaviour | Paco Guzman | 2010-05-15 | 1 | -3/+13 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Accept :alt => nil on image_tag [#4558 state:resolved] | Marc-Andre Lafortune | 2010-05-15 | 1 | -1/+2 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Improve previous patch a bit [#3645 state:resolved] | José Valim | 2010-05-15 | 1 | -0/+5 | |
| | ||||||
* | Let label helpers accept blocks. | Stephen Celis | 2010-05-15 | 2 | -3/+16 | |
| | | | | 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 | -0/+1 | |
| | | | | exceptions middleware. | |||||
* | Fix parsing xml input by ActionDispatch::ParamsParser | Lawrence Pit | 2010-05-06 | 1 | -0/+13 | |
| | | | | | | [#4437 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | move assert_template tests to their own test case [#4501 state:resolved] | David Chelimsky | 2010-05-03 | 1 | -41/+46 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Eliminate false positives when passing symbols to assert_template | David Chelimsky | 2010-05-03 | 1 | -4/+25 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax ↵ | Lawrence Pit | 2010-05-03 | 1 | -3/+3 | |
| | | | | | | for I18n Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | add NullResolver | David Chelimsky | 2010-05-02 | 1 | -0/+12 | |
| | | | | | | [#4523 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | add tests for FixtureResolver | David Chelimsky | 2010-05-02 | 1 | -0/+18 | |
| | | | | 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 | 3 | -32/+1 | |
| | | | | | | [#4522 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | RouteSet does not raise ActionController::RoutingError when no routes match ↵ | Carl Lerche | 2010-04-30 | 2 | -12/+24 | |
| | | | | anymore. Instead, it follows the X-Cascade convention. ShowExceptions checks for X-Cascade so that the routing error page can still be displayed. | |||||
* | Merge remote branch 'technoweenie/http_token_authentication' | Jeremy Kemper | 2010-04-30 | 1 | -0/+113 | |
|\ | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | add HTTP Token Authorization support to complement Basic and Digest ↵ | rick | 2010-04-30 | 1 | -0/+113 | |
| | | | | | | | | Authorization. | |||||
* | | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-30 | 2 | -21/+111 | |
|\| | ||||||
| * | Fix form builder and form helpers inconsistencies [#4432 state:resolved] | Neeraj Singh | 2010-04-29 | 1 | -21/+80 | |
| | | | | | | | | | | | | | | | | * 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> | |||||
| * | ActionCachingTestController rescues from all exceptions. Making sure that ↵ | Neeraj Singh | 2010-04-29 | 1 | -0/+31 | |
| | | | | | | | | | | | | all the tests check for valid response. [#4468 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-26 | 11 | -22/+75 | |
|\| | ||||||
| * | Use Config::CONFIG['host_os'] instead of RUBY_PLATFORM [#4477 state:resolved] | Anil Wadghule | 2010-04-26 | 1 | -1/+2 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Action Pack: fix tests with -K*, work around Ruby 1.9.1 constant lookup. | Cezary Baginski | 2010-04-25 | 2 | -4/+4 | |
| | | | | | | | | | | | | [#4473 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Missed commit: explicit source encoding | Jeremy Kemper | 2010-04-24 | 1 | -1/+1 | |
| | | ||||||
| * | Explicit source encoding | Jeremy Kemper | 2010-04-24 | 1 | -0/+1 | |
| | | ||||||
| * | Add a test for assert_recognizes on ActionDispatch::IntegrationTest [#4390 ↵ | Santiago Pastorino | 2010-04-24 | 2 | -1/+13 | |
| | | | | | | | | | | | | state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Rename fieldWithErrors style to field_with_errors. Remove unused alert style. | Jeremy Kemper | 2010-04-24 | 1 | -4/+4 | |
| | | ||||||
| * | Fix render :xml test (ht Simo Niemelä) | José Valim | 2010-04-24 | 1 | -2/+2 | |
| | | ||||||
| * | Make ActionDispatch url_for use HWIA symbolize_keys | Santiago Pastorino | 2010-04-22 | 1 | -3/+7 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Ensure that url_for uses symbolized keys in the controller. [#4391] | J Smith | 2010-04-22 | 1 | -0/+10 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Always downstream given options in :json, :xml and :js renderers and add ↵ | José Valim | 2010-04-22 | 2 | -7/+35 | |
| | | | | | | | | tests for it. | |||||
| * | Clean up the config object in ActionPack. Create config_accessor which just ↵ | José Valim | 2010-04-22 | 1 | -3/+0 | |
| | | | | | | | | 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 | 2 | -0/+20 | |
|/ | | | | | | | 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> | |||||
* | params already has a setted controller and action here | Santiago Pastorino | 2010-04-21 | 1 | -1/+0 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | url_for now works with HashWithIndifferentAccess ht jay [#4391 state:committed] | Santiago Pastorino | 2010-04-21 | 1 | -0/+10 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Merge branch 'master' of github.com:rails/rails | Carl Lerche | 2010-04-18 | 4 | -2/+28 | |
|\ | ||||||
| * | added shorthand support for routes like /projects/status(.:format) | Diego Carrion | 2010-04-17 | 1 | -0/+9 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | access assigns as a method or hash, with strings or symbols [#4431 ↵ | David Chelimsky | 2010-04-17 | 1 | -0/+16 | |
| | | | | | | | | state:resolved] |