aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-08 16:52:24 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-08 16:52:24 -0300
commitec69a45f5bb49c096f460a6bbe85d9d8890488b5 (patch)
treeca56613443cda48267ca987420f61327ae6f0445 /railties/lib/rails/generators
parenta69e0a5fcfbcd76f259ab1ed290fafa8726b44ba (diff)
parent83b7bf4d3bdb4bc84cbbc5d2859951f5e534e2c2 (diff)
downloadrails-ec69a45f5bb49c096f460a6bbe85d9d8890488b5.tar.gz
rails-ec69a45f5bb49c096f460a6bbe85d9d8890488b5.tar.bz2
rails-ec69a45f5bb49c096f460a6bbe85d9d8890488b5.zip
Merge pull request #20479 from masarakki/no-scaffold.css-option
add option to avoid generating scaffold.css
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
index e89789e72b..17c32bfdb3 100644
--- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -10,10 +10,11 @@ module Rails
class_option :stylesheet_engine, desc: "Engine for Stylesheets"
class_option :assets, type: :boolean
class_option :resource_route, type: :boolean
+ class_option :scaffold_stylesheet, type: :boolean
def handle_skip
@options = @options.merge(stylesheets: false) unless options[:assets]
- @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets]
+ @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] && options[:scaffold_stylesheet]
end
hook_for :scaffold_controller, required: true