Xavier Noria 207fa59675 Merge remote branch 'rails/master' ...

Conflicts:
	actionpack/lib/abstract_controller/base.rb

2010-06-20 23:13:19 +02:00

..

abstract_controller

ActiveRecord and ActionPack now use the new descendants implementation.

2010-06-19 17:15:21 +02:00

action_controller

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

action_dispatch

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

action_pack

Get ready for beta 4

2010-06-08 14:47:02 -04:00

action_view

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

abstract_controller.rb

Extract assets paths and make them available to Action Mailer as well

2010-06-02 16:49:02 -05:00

action_controller.rb

edit pass: the names of Rails components have a space, ie, "Active Record", not "ActiveRecord"

2010-06-14 23:22:04 +02:00

action_dispatch.rb

Removing Metal from Rails 3.

2010-05-29 20:08:00 +02:00

action_pack.rb

Updating copyright dates on all licenses

2010-02-01 10:10:53 +11:00

action_view.rb

Revert "Moved encoding work in progress to a feature branch."

2010-05-17 19:41:54 +04:00