Download as
Browse Code »

Commit f50baa5b292fd10ad9835b058bfa34a3abdce286

Authored by Gust
1 parent 1520d46a
Exists in master and in 34 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Remove PROXIED_APPS from config file 

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Carolina Ramalho <carol15022@hotmail.com>
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Showing 4 changed files with 16 additions and 9 deletions   Show diff stats
colab/proxy/context_processors.py
  Diff comments   View file @f50baa5
1 1  
2   -from django.apps import apps
3 2 from django.conf import settings
4 3  
5 4  
... ...
colab/proxy/gitlab/urls.py
  Diff comments   View file @f50baa5
... ... @@ -3,7 +3,6 @@ from django.conf.urls import patterns, url
3 3  
4 4 from .views import GitlabProxyView
5 5  
6   -
7 6 urlpatterns = patterns('',
8 7 # Gitlab URLs
9 8 url(r'^(?P<path>.*)$', GitlabProxyView.as_view(), name='gitlab'),
... ...
colab/proxy/templatetags/proxy.py
  Diff comments   View file @f50baa5
1 1 from collections import OrderedDict
2 2  
3   -from django.core.urlresolvers import reverse
4 3 from django import template
5 4 from django.core.cache import cache
6 5 from django.template.loader import render_to_string
... ...
colab/settings.py
  Diff comments   View file @f50baa5
... ... @@ -292,11 +292,6 @@ if locals().get(&#39;RAVEN_DSN&#39;, False):
292 292 BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
293 293 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
294 294  
295   -PROXIED_APPS = locals().get('PROXIED_APPS') or {}
296   -
297   -for app_label in PROXIED_APPS.keys():
298   - INSTALLED_APPS += ('colab.proxy.{}'.format(app_label),)
299   -
300 295 COLAB_APPS = locals().get('COLAB_APPS') or {}
301 296  
302 297 for app_name, app in COLAB_APPS.items():
... ... @@ -328,6 +323,21 @@ for app_name, app in COLAB_APPS.items():
328 323 import sys
329 324 sys.path.insert(0, '/etc/colab/')
330 325 try:
331   - from plugin_configs import *
  326 + from plugin_configs import * # noqa (flake8 ignore)
332 327 except ImportError:
333 328 pass
  329 +
  330 +from django.apps import apps
  331 +import django
  332 +django.setup()
  333 +
  334 +PROXIED_APPS = {}
  335 +
  336 +for app_name in COLAB_APPS:
  337 + try:
  338 + config = apps.get_app_config(app_name.split('.')[-1])
  339 + except:
  340 + config = None
  341 +
  342 + if config and getattr(config, 'colab_proxied_app', False):
  343 + PROXIED_APPS[app_name.split('.')[-1]] = COLAB_APPS[app_name]
... ...