aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-04 06:50:45 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-04 06:50:45 -0700
commit628d6f133146a034a555760008e9dfc96fb1ff88 (patch)
tree50cbc9785943bd3ff63f0219ae54c42ed9ce07d7 /railties/lib
parent903a2c2d33c91edaae08a952d94b4ac35a7443da (diff)
parentf1805a697831b356a2a6877291628fea8e2216e6 (diff)
downloadrails-628d6f133146a034a555760008e9dfc96fb1ff88.tar.gz
rails-628d6f133146a034a555760008e9dfc96fb1ff88.tar.bz2
rails-628d6f133146a034a555760008e9dfc96fb1ff88.zip
Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master
Fixes Scaffold generator with --assets=false
Diffstat (limited to 'railties/lib')
-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]