Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 14 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index f81174d707..fd57b1677e 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,9 +1,21 @@
 module ActionView #:nodoc:
   class TextTemplate < String #:nodoc:
+
+    def initialize(string, content_type = Mime[:html])
+      super(string.to_s)
+      @content_type = Mime[content_type]
+    end
+
+    def details
+      {:formats => [@content_type.to_sym]}
+    end
+
+    def identifier() self end
     
     def render(*) self end
     
-    def exempt_from_layout?() false end
-    
+    def mime_type() @content_type end
+      
+    def partial?() false end
   end
 end