aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2013-05-03 11:42:30 +0200
committerArun Agrawal <arunagw@gmail.com>2013-05-04 15:48:44 +0200
commitf1805a697831b356a2a6877291628fea8e2216e6 (patch)
tree50cbc9785943bd3ff63f0219ae54c42ed9ce07d7 /railties/lib/rails
parent903a2c2d33c91edaae08a952d94b4ac35a7443da (diff)
downloadrails-f1805a697831b356a2a6877291628fea8e2216e6.tar.gz
rails-f1805a697831b356a2a6877291628fea8e2216e6.tar.bz2
rails-f1805a697831b356a2a6877291628fea8e2216e6.zip
Fixes Scaffold generator with --assets=false
Scaffold generator with --assets=false option outputs an error See #9525
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb2
1 files changed, 2 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 2a0522e81c..d3b42813e1 100644
--- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -8,6 +8,8 @@ module Rails
class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
class_option :stylesheet_engine, desc: "Engine for Stylesheets"
+ class_option :assets, :type => :boolean
+ class_option :resource_route, :type => :boolean
def handle_skip
@options = @options.merge(stylesheets: false) unless options[:assets]