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/css | |
| 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/css')
| -rw-r--r-- | railties/lib/rails/generators/css/assets/assets_generator.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails/generators/css/scaffold/scaffold_generator.rb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/css/assets/assets_generator.rb b/railties/lib/rails/generators/css/assets/assets_generator.rb index 492177ca2e..e4a305f4b3 100644 --- a/railties/lib/rails/generators/css/assets/assets_generator.rb +++ b/railties/lib/rails/generators/css/assets/assets_generator.rb @@ -1,8 +1,8 @@ require "rails/generators/named_base" -module Css - module Generators - class AssetsGenerator < Rails::Generators::NamedBase +module Css # :nodoc: + module Generators # :nodoc: + class AssetsGenerator < Rails::Generators::NamedBase # :nodoc: source_root File.expand_path("../templates", __FILE__) def copy_stylesheet diff --git a/railties/lib/rails/generators/css/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/css/scaffold/scaffold_generator.rb index 1d7fe9fac0..cf534030f9 100644 --- a/railties/lib/rails/generators/css/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/css/scaffold/scaffold_generator.rb @@ -1,8 +1,8 @@ require "rails/generators/named_base" -module Css - module Generators - class ScaffoldGenerator < Rails::Generators::NamedBase +module Css # :nodoc: + module Generators # :nodoc: + class ScaffoldGenerator < Rails::Generators::NamedBase # :nodoc: # In order to allow the Sass generators to pick up the default Rails CSS and # transform it, we leave it in a standard location for the CSS stylesheet # generators to handle. For the simple, default case, just copy it over. |