diff options
| author | Oscar Del Ben <info@oscardelben.com> | 2012-04-28 11:45:15 +0200 |
|---|---|---|
| committer | Oscar Del Ben <info@oscardelben.com> | 2012-04-28 11:45:15 +0200 |
| commit | 4e69a1579ea74fe2823f6fb2f055db97480492e5 (patch) | |
| tree | d8a5834a0ed5a372969f26db753a30785777a5c2 /railties/lib/rails/engine | |
| parent | 943410197cca4235212ca0fc409820378a40890c (diff) | |
| parent | 0297e8e4ddc034bcb8ed477efff91d8fe104cb39 (diff) | |
| download | rails-4e69a1579ea74fe2823f6fb2f055db97480492e5.tar.gz rails-4e69a1579ea74fe2823f6fb2f055db97480492e5.tar.bz2 rails-4e69a1579ea74fe2823f6fb2f055db97480492e5.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails/engine')
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index d7405cb519..d3b42021fc 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -52,10 +52,11 @@ module Rails paths.add "config/environments", :glob => "#{Rails.env}.rb" paths.add "config/initializers", :glob => "**/*.rb" paths.add "config/locales", :glob => "*.{rb,yml}" - paths.add "config/routes", :with => "config/routes.rb" + paths.add "config/routes.rb" + paths.add "config/routes", :glob => "**/*.rb" paths.add "db" paths.add "db/migrate" - paths.add "db/seeds", :with => "db/seeds.rb" + paths.add "db/seeds.rb" paths.add "vendor", :load_path => true paths.add "vendor/assets", :glob => "*" paths |