diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2014-12-28 14:30:05 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2014-12-28 14:30:05 -0700 |
| commit | e7e1b68093bead9677a0681f0f244aa836b3ef50 (patch) | |
| tree | 4fca4b072e3a6e5e45b5b33e40615185b0f87e80 /railties/lib/rails/engine | |
| parent | ed7196645c40a838e438cbfaa43f76efdf2045a8 (diff) | |
| parent | 4e0ec961e1f81ef672e2728b8650e4358962962f (diff) | |
| download | rails-e7e1b68093bead9677a0681f0f244aa836b3ef50.tar.gz rails-e7e1b68093bead9677a0681f0f244aa836b3ef50.tar.bz2 rails-e7e1b68093bead9677a0681f0f244aa836b3ef50.zip | |
Merge pull request #18213 from agrobbin/moar-concerns
Actually autoload all second-level directories called `app/*/concerns`
Diffstat (limited to 'railties/lib/rails/engine')
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index 10d1821709..62a4139d07 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -39,7 +39,7 @@ module Rails @paths ||= begin paths = Rails::Paths::Root.new(@root) - paths.add "app", eager_load: true, glob: "*" + paths.add "app", eager_load: true, glob: "{*,*/concerns}" paths.add "app/assets", glob: "*" paths.add "app/controllers", eager_load: true paths.add "app/helpers", eager_load: true @@ -47,9 +47,6 @@ module Rails paths.add "app/mailers", eager_load: true paths.add "app/views" - paths.add "app/controllers/concerns", eager_load: true - paths.add "app/models/concerns", eager_load: true - paths.add "lib", load_path: true paths.add "lib/assets", glob: "*" paths.add "lib/tasks", glob: "**/*.rake" |