Blah, identity_map has to be setup in application.rb to work

3 files changed, 11 insertions, 13 deletions

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index ef5c6f628c..bcdb7a7cab 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -114,6 +114,12 @@ module Rails
       empty_directory_with_gitkeep "tmp"
     end
 
+    def vendor
+      vendor_javascripts
+      vendor_stylesheets
+      vendor_plugins
+    end
+
     def vendor_javascripts
       if options[:skip_javascript]
         empty_directory_with_gitkeep "vendor/assets/javascripts"
@@ -217,14 +223,6 @@ module Rails
         build(:images)
       end
 
-      def create_public_stylesheets_files
-        build(:stylesheets)
-      end
-
-      def create_javascript_files
-        build(:javascripts)
-      end
-
       def create_script_files
         build(:script)
       end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 906f912a33..68b2457af5 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -57,5 +57,10 @@ module <%= app_const_base %>
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+<% unless options[:skip_active_record] -%>
+    # Enable IdentityMap for Active Record, to disable set to false or remove the line below.
+    config.active_record.identity_map = true
+<% end -%>
   end
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt
index b04b9ccee7..b26bdee39d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt
@@ -1,8 +1,3 @@
 <%= app_const %>.configure do
   config.assets.enabled = true
-
-<% unless options[:skip_active_record] -%>
-  # Enable IdentityMap for Active Record, to disable set to false or remove the line below.
-  config.active_record.identity_map = true
-<% end -%>
 end
\ No newline at end of file