José Valim and Mikel Lindsaar 4e96442c4e Merge branch 'master' of git://github.com/rails/rails ...

Conflicts:
	actionmailer/lib/action_mailer/mail_helper.rb
	railties/lib/rails/configuration.rb

2010-01-25 09:50:01 +11:00

..

caching

Use safe_concat instead of trying to html_safe! what might be a frozen string

2010-01-10 18:13:43 -08:00

deprecated

Cleanup deprecation notices.

2010-01-18 09:49:38 -06:00

metal

Merge branch 'master' of git://github.com/rails/rails

2010-01-25 09:50:01 +11:00

railties

Make filter parameters based on request, so they can be modified for anything in the middleware stack.

2010-01-21 16:52:49 +01:00

vendor

Flip deferrable autoload convention

2009-12-22 17:27:37 -06:00

base.rb

Ensure helpers work from configured path.

2010-01-24 12:04:37 +01:00

caching.rb

Add subscriber for ActionPack and move all logging inside it.

2010-01-13 01:19:23 +01:00

deprecated.rb

Group together all the old routing dsl logic

2009-10-20 10:46:27 -05:00

metal.rb

Expose last controller in rack env["action_controller.instance"]

2010-01-20 09:00:23 -06:00

middleware.rb

Update AC::Middleware to play better with the normal AC::Metal stack. This required stopping to use #call for non-rack-related stuff

2009-11-05 15:38:25 -08:00

polymorphic_routes.rb

Make polymorphic_url work with symbols again and refactor it [#1384 status:resolved]

2009-10-28 14:13:48 -05:00

railtie.rb

Rename plugin_name to railtie_name and engine_name.

2010-01-24 12:23:21 +01:00

record_identifier.rb

Clean up render @object a bit more.

2009-08-07 00:52:13 -03:00

test_case.rb

Move Flash into middleware

2010-01-15 14:55:13 -06:00

url_rewriter.rb

Remove duplicated url_for code and move methods shared between ActionMailer and ActionController up to AbstractController.

2010-01-07 15:31:50 +01:00