Download as
Browse Code »

Commit e8536b6e99816a8fe8fbfe09e0ff3e9b9ac9ae5a

Authored by Gust
1 parent 07d30f85
Exists in master and in 32 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, 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, 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

Fix load settings

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
colab/settings.py
  Diff comments   View file @e8536b6
@@ -279,7 +279,7 @@ CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True @@ -279,7 +279,7 @@ CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True
279 # Tastypie settings 279 # Tastypie settings
280 TASTYPIE_DEFAULT_FORMATS = ['json', ] 280 TASTYPIE_DEFAULT_FORMATS = ['json', ]
281 281
282 -from .utils.conf import load_colab_apps 282 +from .utils.conf import load_colab_apps, load_py_settings
283 283
284 if locals().get('RAVEN_DSN', False): 284 if locals().get('RAVEN_DSN', False):
285 RAVEN_CONFIG = { 285 RAVEN_CONFIG = {
@@ -291,6 +291,7 @@ BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False @@ -291,6 +291,7 @@ BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
291 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False 291 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
292 292
293 locals().update(load_colab_apps()) 293 locals().update(load_colab_apps())
  294 +locals().update(load_py_settings())
294 295
295 COLAB_APPS = locals().get('COLAB_APPS') or {} 296 COLAB_APPS = locals().get('COLAB_APPS') or {}
296 PROXIED_APPS = {} 297 PROXIED_APPS = {}