Xavier Noria 17c29a0df0 Merge remote-tracking branch 'docrails/master' ... Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb		2013-11-24 20:00:24 +01:00
..
abstract_controller	calculate the ivars to remove in advance as a set and cache them in a	2013-11-06 14:21:40 -08:00
action_controller	Revert "Used Yield instead of block.call" -- this causes all of atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep".	2013-11-14 15:31:27 -08:00
action_dispatch	Merge remote-tracking branch 'docrails/master'	2013-11-24 20:00:24 +01:00
action_pack	rails/master is now 4.1.0.beta	2013-04-29 13:15:24 -03:00
abstract_controller.rb	No need for .rb extension	2013-08-25 11:39:09 +02:00
action_controller.rb	Remove BasicRendering tests	2013-09-09 16:10:41 -03:00
action_dispatch.rb	Remove extra whitespace	2013-04-06 00:54:44 +03:00
action_pack.rb	Updated copyright notices for 2013	2012-12-31 20:35:29 +00:00