aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorKevin Glowacz <kevin@glowacz.info>2013-03-20 15:09:15 -0500
committerKevin Glowacz <kevin@glowacz.info>2013-03-20 15:24:45 -0500
commit2e5f49dcbfc7806afba9210e1758c54b42227e74 (patch)
tree7c5dd4324f26b6249d9a5f4a2ba263c4e043ce5b /railties/lib
parent34c7e73c1def1312e59ef1f334586ff2f668246e (diff)
downloadrails-2e5f49dcbfc7806afba9210e1758c54b42227e74.tar.gz
rails-2e5f49dcbfc7806afba9210e1758c54b42227e74.tar.bz2
rails-2e5f49dcbfc7806afba9210e1758c54b42227e74.zip
Don't generate a scaffold.css if no-assets
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
index 36589d65e2..2a0522e81c 100644
--- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -10,6 +10,7 @@ module Rails
class_option :stylesheet_engine, desc: "Engine for Stylesheets"
def handle_skip
+ @options = @options.merge(stylesheets: false) unless options[:assets]
@options = @options.merge(stylesheet_engine: false) unless options[:stylesheets]
end