diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-03-20 13:56:01 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-03-20 13:56:01 -0700 |
| commit | f73c52c3bc6b67c68726b789131259bb44dbf958 (patch) | |
| tree | 7c5dd4324f26b6249d9a5f4a2ba263c4e043ce5b /railties/lib/rails | |
| parent | 34c7e73c1def1312e59ef1f334586ff2f668246e (diff) | |
| parent | 2e5f49dcbfc7806afba9210e1758c54b42227e74 (diff) | |
| download | rails-f73c52c3bc6b67c68726b789131259bb44dbf958.tar.gz rails-f73c52c3bc6b67c68726b789131259bb44dbf958.tar.bz2 rails-f73c52c3bc6b67c68726b789131259bb44dbf958.zip | |
Merge pull request #9837 from kjg/no_scaffold_css_when_no_assets
Don't generate a scaffold.css when --no-assets is specified
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 1 |
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 |