Merge branch 'master' of github.com:lifo/docrails

1 files changed, 4 insertions, 10 deletions

diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index bd25111405..6a41bde9f6 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -1,11 +1,5 @@
 require 'set'
 
-class String
-  def html_safe!
-    self
-  end unless "post 9415935902f120a9bac0bfce7129725a0db38ed3".respond_to?(:html_safe!)
-end
-
 module RailsGuides
   class Generator
     attr_reader :output, :view_path, :view, :guides_dir
@@ -61,7 +55,7 @@ module RailsGuides
           body = set_header_section(body, @view)
           body = set_index(body, @view)
 
-          result = view.render(:layout => 'layout', :text => textile(body).html_safe!)
+          result = view.render(:layout => 'layout', :text => textile(body).html_safe)
           f.write result
           warn_about_broken_links(result) if ENV.key?("WARN_BROKEN_LINKS")
         end
@@ -77,8 +71,8 @@ module RailsGuides
 
       header = textile(header)
 
-      view.content_for(:page_title) { page_title.html_safe! }
-      view.content_for(:header_section) { header.html_safe! }
+      view.content_for(:page_title) { page_title.html_safe }
+      view.content_for(:header_section) { header.html_safe }
       new_body
     end
 
@@ -109,7 +103,7 @@ module RailsGuides
       index << '</ol>'
       index << '</div>'
 
-      view.content_for(:index_section) { index.html_safe! }
+      view.content_for(:index_section) { index.html_safe }
 
       i.result
     end