From 2906830748a4e9a4530047019d2007a1f0da42c2 Mon Sep 17 00:00:00 2001 From: wycats Date: Tue, 3 Aug 2010 14:28:51 -0700 Subject: [PATCH] Remove a hack that was moved to 3.0 --- rails_upgrade.rb | 1 - rails_upgrade/action_view.rb | 7 ------- 2 files changed, 8 deletions(-) diff --git a/rails_upgrade.rb b/rails_upgrade.rb index c7d050d..fc588c1 100644 --- a/rails_upgrade.rb +++ b/rails_upgrade.rb @@ -56,7 +56,6 @@ def require_bundler require "rails/all" require "active_support/all" -require "rails_upgrade/action_controller" require "rails_upgrade/action_view" # This is needed because Rails 3 requires development.rb, while Rails 2.3 diff --git a/rails_upgrade/action_view.rb b/rails_upgrade/action_view.rb index 86050c0..8478e7d 100644 --- a/rails_upgrade/action_view.rb +++ b/rails_upgrade/action_view.rb @@ -1,6 +1,5 @@ require "action_view" require "action_view/base" -require "active_support/all" module ActiveSupport remove_const :SafeBuffer @@ -13,12 +12,6 @@ class SafeBuffer < String module ActionView class Base - alias old_initialize initialize - def initialize(*args) - old_initialize(*args) - @controller = @_controller - end - # change the default behavior for tag and content_tag to not escape module DeactivateEscape def tag(name, options = nil, open = false, escape = false)