Merge branch 'master' of https://github.com/rails/rails into performance_test

1 files changed, 1 insertions, 8 deletions

diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
index 38711c8462..dfda6618e7 100644
--- a/actionpack/lib/action_controller/metal/renderers.rb
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -41,7 +41,7 @@ module ActionController
     end
 
     # Hash of available renderers, mapping a renderer name to its proc.
-    # Default keys are :json, :js, :xml and :update.
+    # Default keys are :json, :js, :xml.
     RENDERERS = {}
 
     # Adds a new renderer to call within controller actions.
@@ -107,12 +107,5 @@ module ActionController
       self.content_type ||= Mime::XML
       self.response_body  = xml.respond_to?(:to_xml) ? xml.to_xml(options) : xml
     end
-
-    add :update do |proc, options|
-      view_context = self.view_context
-      generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
-      self.content_type  = Mime::JS
-      self.response_body = generator.to_s
-    end
   end
 end