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

Conflicts:
	RELEASING_RAILS.rdoc
	actionpack/lib/sprockets/railtie.rb
	actionpack/test/template/sprockets_helper_test.rb
	activerecord/test/cases/calculations_test.rb
	railties/guides/source/3_1_release_notes.textile
	railties/guides/source/active_resource_basics.textile
	railties/guides/source/command_line.textile

2011-08-13 16:30:07 -07: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

Remove unused use_sprockets config

2011-08-13 16:22:15 -07:00

base.rb

Remove extra white spaces on ActionPack docs.

2011-05-23 20:22:33 -03:00

callbacks.rb

update abstract_controller callbacks to document meta-programmed filters

2011-08-13 16:22:35 -07:00

collector.rb

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

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

helpers.rb

Remove extra white spaces on ActionPack docs.

2011-05-23 20:22:33 -03:00

layouts.rb

Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937.

2011-07-18 00:22:26 +01: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

adding missing require to fist railties tests

2011-08-09 14:54:56 -07:00