diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2017-01-11 15:15:13 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2017-01-11 15:15:13 +0000 |
| commit | 8898a0ae2a0d5c8826fe08bbf4ccd10745802f9e (patch) | |
| tree | 60f4624da0e7853186d8b9786dbb3263080791d0 /railties/lib/rails/generators.rb | |
| parent | e11f11f962f586cf84066ebbe667e409ae835c95 (diff) | |
| parent | 5c72675c73979901592cef0f2a482527782b2dfb (diff) | |
| download | rails-8898a0ae2a0d5c8826fe08bbf4ccd10745802f9e.tar.gz rails-8898a0ae2a0d5c8826fe08bbf4ccd10745802f9e.tar.bz2 rails-8898a0ae2a0d5c8826fe08bbf4ccd10745802f9e.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
railties/lib/rails/generators.rb
Diffstat (limited to 'railties/lib/rails/generators.rb')
| -rw-r--r-- | railties/lib/rails/generators.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index e1980a42ad..99bda728ee 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -218,7 +218,7 @@ module Rails [[ "rails", rails ]] + groups.sort.to_a end - # Rails finds namespaces similar to thor, it only adds one rule: + # Rails finds namespaces similar to Thor, it only adds one rule: # # Generators names must end with "_generator.rb". This is required because Rails # looks in load paths and loads the generator just before it's going to be used. |