Joshua Peek c800e27ad3 Merge branch 'master' into asset-path-helper ... Conflicts: railties/test/application/configuration_test.rb		2012-10-15 10:20:50 -05:00
..
railties	Rely on a public contract between railties instead of accessing railtie methods directly.	2011-11-23 19:06:45 +00:00
asset_paths.rb	🔥 Rails asset id support	2012-10-15 09:47:16 -05:00
base.rb	remove 'then' from conditional statement	2012-10-14 21:08:25 +06:00
callbacks.rb	removing key argument from run_callbacks - fix build	2012-05-10 02:56:36 -05:00
collector.rb	Prevent conflict between mime types and Object methods	2012-07-06 20:38:23 +02:00
helpers.rb	Fixed indendation	2012-08-29 10:25:36 +02:00
layouts.rb	Add instance_accessor option to class_attribute	2012-05-22 00:28:34 +04:00
logger.rb	avoid empty api pages	2012-04-08 01:56:41 +05:30
rendering.rb	remove AV.prepare and move all helper-related logic into the controller. this decouples the view since it no longer knows about routes internals.	2012-06-29 11:33:37 +02:00
translation.rb	add lazy look up in abstract controller's translate method	2012-07-18 10:33:14 +03:00
url_for.rb	Clean up module docs [ci skip]	2012-03-07 01:04:14 +05:30
view_paths.rb	Use Kernel#Array instead of Array.wrap in view_paths	2012-01-05 17:08:18 -03:00