Download as
Browse Code »

Commit e2241836a0920ec9d65e8927b8a27af9144bc8f5

Authored by Sergio Oliveira
1 parent a2e34e57
Exists in master and in 31 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

removed sentry from deps

Showing 3 changed files with 13 additions and 13 deletions   Show diff stats
colab/management/initconfig.py
  Diff comments   View file @e224183
@@ -45,9 +45,6 @@ DATABASES = {{ @@ -45,9 +45,6 @@ DATABASES = {{
45 ## Disable indexing 45 ## Disable indexing
46 ROBOTS_NOINDEX = False 46 ROBOTS_NOINDEX = False
47 47
48 -### Log errors to Sentry instance  
49 -# RAVEN_DSN = 'http://public:secret@example.com/1'  
50 -  
51 LOGGING = {{ 48 LOGGING = {{
52 'version': 1, 49 'version': 1,
53 50
colab/settings.py
  Diff comments   View file @e224183
@@ -252,12 +252,7 @@ TASTYPIE_DEFAULT_FORMATS = ['json', ] @@ -252,12 +252,7 @@ TASTYPIE_DEFAULT_FORMATS = ['json', ]
252 252
253 from .utils.conf import load_colab_apps, load_py_settings 253 from .utils.conf import load_colab_apps, load_py_settings
254 254
255 -if locals().get('RAVEN_DSN', False):  
256 - RAVEN_CONFIG = {  
257 - 'dsn': RAVEN_DSN + '?timeout=30', # noqa  
258 - }  
259 - INSTALLED_APPS += ('raven.contrib.django.raven_compat',)  
260 - 255 +BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
261 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False 256 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
262 257
263 locals().update(load_colab_apps()) 258 locals().update(load_colab_apps())
@@ -25,11 +25,19 @@ REQUIREMENTS = [ @@ -25,11 +25,19 @@ REQUIREMENTS = [
25 'gunicorn==19.1.0', 25 'gunicorn==19.1.0',
26 'eventlet==0.15.2', 26 'eventlet==0.15.2',
27 27
28 - # Deps for sentry client (raven)  
29 - 'raven==3.5.2',  
30 - 'tornado==3.1.1', 28 + # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
  29 + 'django-browserid==0.11',
  30 + 'django-revproxy==0.9.0',
31 31
32 - 'django-revproxy==0.9.3', 32 + # Converse.js (XMPP client)
  33 + 'django-conversejs==0.3.4',
  34 +
  35 + # Feedzilla (planet) and deps
  36 + 'django-common==0.1.51',
  37 + 'feedparser==5.1.3',
  38 + 'lxml==3.2.4',
  39 + 'grab==0.4.13',
  40 + 'transliterate==1.5',
33 41
34 # Diazo 42 # Diazo
35 'diazo==1.0.5', 43 'diazo==1.0.5',