diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-10-11 01:05:14 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-10-11 01:05:14 +0530 |
commit | f638ef951b4d185b2bfd3d0d8be241cb23001890 (patch) | |
tree | 6fc5b981d4e8cc148ff5a63d6a753804247db375 /railties/lib/rails/generators/test_unit/scaffold | |
parent | 3401d5089ba4802b6554483a4de7739e6f914e50 (diff) | |
parent | 26ec070b09ceb798b471fd6999ae1da319120899 (diff) | |
download | rails-f638ef951b4d185b2bfd3d0d8be241cb23001890.tar.gz rails-f638ef951b4d185b2bfd3d0d8be241cb23001890.tar.bz2 rails-f638ef951b4d185b2bfd3d0d8be241cb23001890.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/persistence.rb
railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
Diffstat (limited to 'railties/lib/rails/generators/test_unit/scaffold')
-rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb index e9de51ba72..0462c15224 100644 --- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb @@ -1,9 +1,9 @@ require 'rails/generators/test_unit' require 'rails/generators/resource_helpers' -module TestUnit - module Generators - class ScaffoldGenerator < Base +module TestUnit # :nodoc: + module Generators # :nodoc: + class ScaffoldGenerator < Base # :nodoc: include Rails::Generators::ResourceHelpers check_class_collision :suffix => "ControllerTest" |