From a02807c5eb3f071d1d46a9525e3d4ec78682aace Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 2 Mar 2017 20:34:58 +0100 Subject: [PATCH] channelstream: move into apps --- rhodecode/{ => apps}/channelstream/__init__.py | 4 +++- rhodecode/{ => apps}/channelstream/views.py | 0 rhodecode/config/middleware.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename rhodecode/{ => apps}/channelstream/__init__.py (97%) rename rhodecode/{ => apps}/channelstream/views.py (100%) diff --git a/rhodecode/channelstream/__init__.py b/rhodecode/apps/channelstream/__init__.py similarity index 97% rename from rhodecode/channelstream/__init__.py rename to rhodecode/apps/channelstream/__init__.py index e798b49d..5417f407 100644 --- a/rhodecode/channelstream/__init__.py +++ b/rhodecode/apps/channelstream/__init__.py @@ -85,4 +85,6 @@ def includeme(config): config.add_route( name='channelstream_proxy', pattern=settings.get('channelstream.proxy_path') or '/_channelstream') - config.scan('rhodecode.channelstream') + + # Scan module for configuration decorators. + config.scan() diff --git a/rhodecode/channelstream/views.py b/rhodecode/apps/channelstream/views.py similarity index 100% rename from rhodecode/channelstream/views.py rename to rhodecode/apps/channelstream/views.py diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py index 267dc02c..17bf7901 100644 --- a/rhodecode/config/middleware.py +++ b/rhodecode/config/middleware.py @@ -278,12 +278,12 @@ def includeme(config): config.include('pyramid_mako') config.include('pyramid_beaker') - config.include('rhodecode.channelstream') config.include('rhodecode.authentication') config.include('rhodecode.integrations') # apps config.include('rhodecode.apps.admin') + config.include('rhodecode.apps.channelstream') config.include('rhodecode.apps.login') config.include('rhodecode.apps.user_profile')