From 927a04da40b3d9b97cb23be7c0820eee629f0f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sat, 4 May 2013 06:50:45 -0700 Subject: Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master Fixes Scaffold generator with --assets=false Conflicts: railties/CHANGELOG.md Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb --- railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'railties/lib') diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index 03a61a035e..353ebe93ed 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 hook_for :scaffold_controller, :required => true -- cgit v1.2.3