Xavier Noria d491130236 Merge branch 'master' of git://github.com/lifo/docrails ...

Conflicts:
	actionpack/lib/action_view/helpers/date_helper.rb
	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

2011-05-14 11:21:27 +02:00

..

railties

Move ActionController::Railties::RoutesHelpers and ActionMailer::Railties::RoutesHelper to AbstractController::Railties::RoutesHelpers

2010-09-03 22:59:11 +02:00

asset_paths.rb

Copy use_sprockets config

2011-03-29 16:17:49 -05:00

base.rb

better styling on #available_action? docs

2011-05-06 14:23:25 -03:00

callbacks.rb

Revert to old semantics, use available_action? instead of action_method?.

2011-05-06 18:44:18 +02:00

collector.rb

Add missing require on abstract_controller/collector [#4061 status:resolved]

2010-02-26 10:27:06 +01:00

helpers.rb

Move prefixes to view paths as they are now a lookup context dependency.

2011-05-04 11:28:37 +02:00

layouts.rb

More updates to ivars list.

2011-05-06 14:57:25 +02:00

logger.rb

Clean up the config object in ActionPack. Create config_accessor which just delegates to the config object, reducing the number of deprecations and add specific tests.

2010-04-22 12:00:13 +02:00

rendering.rb

More updates to ivars list.

2011-05-06 14:57:25 +02:00

translation.rb

Move ActionController::Translation to AbstractController::Translation.

2010-01-20 15:02:13 +01:00

url_for.rb

minor edits after going through what's new in docrails

2011-05-14 11:15:43 +02:00

view_paths.rb

Move variables to underscore format, update protected instance variables list.

2011-05-06 14:57:25 +02:00