diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-02-05 22:48:48 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-02-14 17:46:48 +0100 |
| commit | 661298176c72eefc6d0f42b58210119e76962364 (patch) | |
| tree | 521b31e85b607dff781a3ad40ae43bdf52022f8b /railties | |
| parent | f611e59cb16677156c231aa6328f7e7d47da2a28 (diff) | |
| download | rails-661298176c72eefc6d0f42b58210119e76962364.tar.gz rails-661298176c72eefc6d0f42b58210119e76962364.tar.bz2 rails-661298176c72eefc6d0f42b58210119e76962364.zip | |
Inject Rails' channel paths in engine.
We were explicitly referencing Rails.root in ActionCable::Server::Configuration.initialize,
thereby coupling ourselves to Rails.
Instead add `app/channels` to Rails' app paths and assign the existent files
to `channel_paths`.
Users can still append to those load paths with `<<` and `push` in `config/application.rb`.
This means we can remove the custom `Dir` lookup in `channel_paths` and the Rails
and root definitions in the tests.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index 8cadbc3ddd..294d07446f 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -39,6 +39,7 @@ module Rails paths.add "app", eager_load: true, glob: "{*,*/concerns}" paths.add "app/assets", glob: "*" paths.add "app/controllers", eager_load: true + paths.add "app/channels", eager_load: true, glob: "**/*_channel.rb" paths.add "app/helpers", eager_load: true paths.add "app/models", eager_load: true paths.add "app/mailers", eager_load: true |