Merge commit 'josevalim/fixes'

Conflicts:
	railties/test/generators/app_generator_test.rb

1 files changed, 0 insertions, 34 deletions

diff --git a/railties/lib/rails/generators/active_record.rb b/railties/lib/rails/generators/active_record.rb
index c03ea59c1b..babad33db3 100644
--- a/railties/lib/rails/generators/active_record.rb
+++ b/railties/lib/rails/generators/active_record.rb
@@ -18,39 +18,5 @@ module ActiveRecord
           end
         end
     end
-
-    class ActiveModel < Rails::Generators::ActiveModel #:nodoc:
-      def self.all(klass)
-        "#{klass}.all"
-      end
-
-      def self.find(klass, params=nil)
-        "#{klass}.find(#{params})"
-      end
-
-      def self.build(klass, params=nil)
-        if params
-          "#{klass}.new(#{params})"
-        else
-          "#{klass}.new"
-        end
-      end
-
-      def save
-        "#{name}.save"
-      end
-
-      def update_attributes(params=nil)
-        "#{name}.update_attributes(#{params})"
-      end
-
-      def errors
-        "#{name}.errors"
-      end
-
-      def destroy
-        "#{name}.destroy"
-      end
-    end
   end
 end