Download as
Browse Code »

Commit 39ffa2ab7d0d416c35a3c2acb8c90936b6a8fa84

Authored by Sergio Oliveira
2 parents 05aa61b1 ea99b7f8
Exists in master and in 39 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_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Merge branch 'settings_fix' into 'master' 

Settings fix
Showing 1 changed file with 6 additions and 20 deletions   Show diff stats
colab/settings.py
  Diff comments   View file @39ffa2a
... ... @@ -28,8 +28,6 @@ TEMPLATE_DEBUG = True
28 28  
29 29 ALLOWED_HOSTS = []
30 30  
31   -DATABASE_ROUTERS = []
32   -
33 31 # Application definition
34 32  
35 33 INSTALLED_APPS = (
... ... @@ -70,16 +68,6 @@ INSTALLED_APPS = (
70 68 'common',
71 69 )
72 70  
73   -MIDDLEWARE_CLASSES = (
74   - 'django.contrib.sessions.middleware.SessionMiddleware',
75   - 'django.middleware.common.CommonMiddleware',
76   - 'django.middleware.csrf.CsrfViewMiddleware',
77   - 'django.contrib.auth.middleware.AuthenticationMiddleware',
78   - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
79   - 'django.contrib.messages.middleware.MessageMiddleware',
80   - 'django.middleware.clickjacking.XFrameOptionsMiddleware',
81   -)
82   -
83 71 ROOT_URLCONF = 'colab.urls'
84 72  
85 73 WSGI_APPLICATION = 'colab.wsgi.application'
... ... @@ -87,8 +75,6 @@ WSGI_APPLICATION = 'colab.wsgi.application'
87 75 # Internationalization
88 76 # https://docs.djangoproject.com/en/1.7/topics/i18n/
89 77  
90   -LANGUAGE_CODE = 'en-us'
91   -
92 78 TIME_ZONE = 'UTC'
93 79  
94 80 USE_I18N = True
... ... @@ -200,7 +186,6 @@ CACHES = {
200 186  
201 187 DATABASE_ROUTERS = []
202 188  
203   -
204 189 TEMPLATE_CONTEXT_PROCESSORS = (
205 190 'django.contrib.auth.context_processors.auth',
206 191 'django.core.context_processors.debug',
... ... @@ -222,6 +207,7 @@ MIDDLEWARE_CLASSES = (
222 207 'django.middleware.common.CommonMiddleware',
223 208 'django.middleware.csrf.CsrfViewMiddleware',
224 209 'django.contrib.auth.middleware.AuthenticationMiddleware',
  210 + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
225 211 'django.contrib.messages.middleware.MessageMiddleware',
226 212 'django.middleware.clickjacking.XFrameOptionsMiddleware',
227 213 'django_mobile.middleware.MobileDetectionMiddleware',
... ... @@ -257,16 +243,16 @@ MESSAGE_TAGS = {
257 243 messages.ERROR: 'alert-danger',
258 244 }
259 245  
260   -### Feedzilla (planet)
261   -from feedzilla.settings import *
  246 +# Feedzilla (planet)
  247 +from feedzilla.settings import * # noqa (flake8 ignore)
262 248 FEEDZILLA_PAGE_SIZE = 5
263 249 FEEDZILLA_SITE_TITLE = _(u'Planet Colab')
264 250 FEEDZILLA_SITE_DESCRIPTION = _(u'Colab blog aggregator')
265 251  
266   -### Mailman API settings
  252 +# Mailman API settings
267 253 MAILMAN_API_URL = 'http://localhost:9000'
268 254  
269   -### BrowserID / Persona
  255 +# BrowserID / Persona
270 256 SITE_URL = 'http://localhost:8000'
271 257 BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
272 258  
... ... @@ -279,7 +265,7 @@ BROWSERID_CREATE_USER = False
279 265  
280 266 REVPROXY_ADD_REMOTE_USER = True
281 267  
282   -## Converse.js settings
  268 +# Converse.js settings
283 269 # This URL must use SSL in order to keep chat sessions secure
284 270 CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
285 271  
... ...