diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-06-26 22:57:34 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-06-26 22:57:34 +0530 |
| commit | 317aaa05883c92165cfb8204634b9fd9b976a97b (patch) | |
| tree | af4186590fb1237499f79f0a0102f4d4dccc7a0c /railties | |
| parent | 342de058c44f6ba93c1cfeeedfc4768ea5325a3a (diff) | |
| parent | 73b13f7dc908e419a404add8a331436fe5d67708 (diff) | |
| download | rails-317aaa05883c92165cfb8204634b9fd9b976a97b.tar.gz rails-317aaa05883c92165cfb8204634b9fd9b976a97b.tar.bz2 rails-317aaa05883c92165cfb8204634b9fd9b976a97b.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/layout.html.erb
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/controller/USAGE | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/controller/USAGE b/railties/lib/rails/generators/rails/controller/USAGE index 64239ad599..de33900e0a 100644 --- a/railties/lib/rails/generators/rails/controller/USAGE +++ b/railties/lib/rails/generators/rails/controller/USAGE @@ -16,3 +16,4 @@ Example: Test: test/controllers/credit_cards_controller_test.rb Views: app/views/credit_cards/debit.html.erb [...] Helper: app/helpers/credit_cards_helper.rb + Test: test/helpers/credit_cards_helper_test.rb |