]> git.openstreetmap.org Git - rails.git/commitdiff
Remove monkey patch which has been merged upstream in rails 4
authorTom Hughes <tom@compton.nu>
Sat, 30 Nov 2013 14:02:49 +0000 (14:02 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 30 Nov 2013 14:02:49 +0000 (14:02 +0000)
config/initializers/action_view.rb [deleted file]

diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb
deleted file mode 100644 (file)
index 1789ec1..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Make :formats work when rendering one partial from another
-#
-# Taken from https://github.com/rails/rails/pull/6626
-#
-module ActionView
-  class AbstractRenderer #:nodoc:
-    def prepend_formats(formats)
-      formats = Array(formats)
-      return if formats.empty?
-      @lookup_context.formats = formats | @lookup_context.formats
-    end
-  end
-
-  class PartialRenderer
-    def setup_with_formats(context, options, block)
-      prepend_formats(options[:formats])
-      setup_without_formats(context, options, block)
-    end
-
-    alias_method_chain :setup, :formats
-  end
-
-  class TemplateRenderer
-    def render_with_formats(context, options)
-      prepend_formats(options[:formats])
-      render_without_formats(context, options)
-    end
-
-    alias_method_chain :render, :formats
-  end
-end