Skip to content
Browse files

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

  • Loading branch information...
1 parent 6fa7c3e commit 5e7e81ab1aaeed504b9832fb88dfb63977e96c84 @dhh dhh committed
View
14 railties/lib/rails/generators/rails/app/app_generator.rb
@@ -114,6 +114,12 @@ def tmp
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 @@ def create_public_image_files
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
View
5 railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -57,5 +57,10 @@ class Application < Rails::Application
# 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
View
5 ...ies/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

0 comments on commit 5e7e81a

Please sign in to comment.
Something went wrong with that request. Please try again.