Yehuda Katz + Carl Lerche 00a9d4b91c Merge branch 'master' into wip_abstract_controller ...

Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb

2009-05-11 17:07:05 -07:00

..

active_record_helper_i18n_test.rb

Object names with underscore do the wrong lookup in I18n on error_messages_for.

2009-04-05 21:08:14 +12:00

active_record_helper_test.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

asset_tag_helper_test.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

atom_feed_helper_test.rb

Temporarily modifies setup to call super directly. This can support more T::U runners.

2009-04-08 17:33:41 -07:00

benchmark_helper_test.rb

Added :silence option to BenchmarkHelper#benchmark and turned log_level into a hash parameter and deprecated the old use [DHH]

2009-01-01 18:53:16 +01:00

body_parts_test.rb

Functional test runner finalizes response just like the integration test runner. In both runners, the @response object will now behave the same.

2009-05-02 14:57:40 -05:00

compiled_templates_test.rb

Refactor ActionView::Template

2009-04-27 11:49:11 -07:00

date_helper_i18n_test.rb

Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.

2009-02-03 18:40:22 -08:00

date_helper_test.rb

Stops date select helpers from defaulting the selected date to today if :prompt option has been used

2009-02-13 22:04:27 +13:00

erb_util_test.rb

add json_escape ERB util to escape html entities in json strings that are output in HTML pages. [rick]

2008-04-08 04:52:01 +00:00

form_helper_test.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

form_options_helper_test.rb

Temporarily modifies setup to call super directly. This can support more T::U runners.

2009-04-08 17:33:41 -07:00

form_tag_helper_test.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

javascript_helper_test.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

number_helper_i18n_test.rb

Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.

2009-02-03 18:40:22 -08:00

number_helper_test.rb

Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved]

2009-03-09 12:53:44 +00:00

output_buffer_test.rb

Merge branch 'master' into wip_abstract_controller

2009-05-11 17:07:05 -07:00

prototype_helper_test.rb

* Add pluggable JSON backends with support for the JSON gem. [rick]

2009-04-23 00:08:40 -07:00

record_tag_helper_test.rb

Temporarily modifies setup to call super directly. This can support more T::U runners.

2009-04-08 17:33:41 -07:00

render_test.rb

Refactor ActionView::Template

2009-04-27 11:49:11 -07:00

sanitize_helper_test.rb

Include all helpers into ActionView::Helper

2008-08-25 21:50:26 -05:00

scriptaculous_helper_test.rb

Temporarily modifies setup to call super directly. This can support more T::U runners.

2009-04-08 17:33:41 -07:00

tag_helper_test.rb

Tag helper should output an attribute with the value 'false' instead of omitting the attribute, if the associated option is false but not nil.

2008-11-13 21:55:58 +01:00

test_test.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

text_helper_test.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00

translation_helper_test.rb

Added partial scoping to TranslationHelper#translate, so if you call translate('.foo') from the people/index.html.erb template, you'll actually be calling I18n.translate(people.index.foo) [DHH]

2009-02-10 12:57:12 +01:00

url_helper_test.rb

Bring abstract_controller up to date with rails/master

2009-04-13 15:18:45 -07:00