This project is archived and is in readonly mode.
Changeset [1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d] by Mikel Lindsaar
Revision 1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d,
committed by Mikel Lindsaar
· January 23rd, 2010 @ 08:45 AM
Merge branch 'master' of git://github.com/rails/rails
http://github.com/rails/rails/commit/1ea84c38ea5b40642f3dcdb5ffca1c...
24 changed files
-
M
actionpack/lib/abstract_controller/rendering.rb -
M
actionpack/lib/action_controller/base.rb -
M
actionpack/lib/action_controller/metal/rendering.rb -
M
actionpack/lib/action_view/base.rb -
M
actionpack/lib/action_view/helpers/asset_tag_helper.rb -
M
actionpack/lib/action_view/helpers/cache_helper.rb -
M
actionpack/lib/action_view/helpers/url_helper.rb -
M
actionpack/test/abstract/render_test.rb -
M
activerecord/lib/active_record/base.rb -
M
activerecord/lib/active_record/relation.rb -
M
activerecord/test/cases/method_scoping_test.rb -
M
activerecord/test/cases/named_scope_test.rb -
M
activerecord/test/cases/relations_test.rb -
M
activerecord/test/models/post.rb -
M
railties/lib/generators/rails/app/templates/config.ru -
M
railties/lib/generators/rails/app/templates/db/seeds.rb -
M
railties/lib/generators/rails/app/templates/script/console.tt -
M
railties/lib/generators/rails/app/templates/script/dbconsole.tt -
M
railties/lib/generators/rails/metal/templates/metal.rb -
M
railties/lib/generators/rails/plugin/templates/Rakefile.tt -
M
railties/lib/rails/application.rb -
M
railties/test/application/middleware_test.rb -
M
railties/test/application/routing_test.rb -
M
railties/test/generators/plugin_generator_test.rb