Xavier Noria 207fa59675 Merge remote branch 'rails/master' ... Conflicts: actionpack/lib/abstract_controller/base.rb		2010-06-20 23:13:19 +02:00
..
caching	cache_sweeper yields blank output	2010-06-08 23:20:04 +02:00
deprecated	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
metal	Merge remote branch 'rails/master'	2010-06-20 23:13:19 +02:00
railties	Consistent routing language	2010-03-30 14:05:42 -05:00
vendor	regular expressions are usually ASCII-encoded, so force_encoding the content of a Node to the encoding of the regular expression is wrong.	2010-06-07 18:06:08 -04:00
base.rb	Add an asset_host accessor for consistency.	2010-06-02 14:53:56 -07:00
caching.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
deprecated.rb	…
metal.rb	Remove a relic of #request being in RackDelegation	2010-06-19 08:19:15 -07:00
middleware.rb	Simplify the action endpoint:	2010-03-08 16:50:00 -08:00
polymorphic_routes.rb	Make polymorphic_url and scaffolding work with uncountable resources [#3930 state:resolved]	2010-06-20 00:15:41 +02:00
railtie.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
record_identifier.rb	Make polymorphic_url and scaffolding work with uncountable resources [#3930 state:resolved]	2010-06-20 00:15:41 +02:00
test_case.rb	Fix a bunch of minor spelling mistakes	2010-06-11 14:15:34 +04:00