Permalink
Browse files

Remove a hack that was moved to 3.0

  • Loading branch information...
1 parent 9c96c32 commit 2906830748a4e9a4530047019d2007a1f0da42c2 @wycats committed Aug 3, 2010
Showing with 0 additions and 8 deletions.
  1. +0 −1 rails_upgrade.rb
  2. +0 −7 rails_upgrade/action_view.rb
View
@@ -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
@@ -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)

0 comments on commit 2906830

Please sign in to comment.