Pratik Naik b04230e3bb Merge remote branch 'mainstream/master' ...

Conflicts:
	actionpack/lib/action_controller/metal/flash.rb

2010-01-17 03:20:30 +05:30

..

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

Move Dispatcher setup to Railties and add instrumentation hook.

2010-01-15 12:24:30 +01:00

metal

Merge remote branch 'mainstream/master'

2010-01-17 03:20:30 +05:30

railties

Do not send the whole controller in notifications, cherry pick required pieces.

2010-01-15 12:24:31 +01:00

vendor

Flip deferrable autoload convention

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

base.rb

Do not send the whole controller in notifications, cherry pick required pieces.

2010-01-15 12:24:31 +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

controller_path is required by ActionView, so move it up to AbstractController and refactor AbstractController::Layouts.

2009-12-31 18:40:20 -08: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

Move Dispatcher setup to Railties and add instrumentation hook.

2010-01-15 12:24:30 +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

translation.rb

Fix some Ruby warnings: `*' interpreted as argument prefix

2009-11-09 14:46:29 -05: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