Commit af994edf authored by Mathieu Courcelles's avatar Mathieu Courcelles

Merge branch 'dev' into 'master'

Dev

See merge request !27
parents 40976930 af9e3667
Pipeline #34714221 passed with stages
in 4 minutes and 9 seconds
......@@ -103,7 +103,7 @@ MIDDLEWARE = [
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware',
#'debug_toolbar.middleware.DebugToolbarMiddleware',
# Uncomment the next line for simple clickjacking protection:
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
......@@ -144,11 +144,8 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'debug_toolbar',
'defender',
'raven.contrib.django.raven_compat',
# Uncomment the next line to enable the admin:
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
......
......@@ -73,6 +73,10 @@ TIME_ZONE = 'America/Montreal'
PERCOLATOR_BIN = r'/usr/bin/percolator'
if os.getenv('SENTRY', None):
INSTALLED_APPS.append('raven.contrib.django.raven_compat')
MIDDLEWARE.insert(2, 'raven.contrib.django.raven_compat.middleware.'
'Sentry404CatchMiddleware')
RAVEN_CONFIG = {
'dsn': get_secret('SENTRY'),
# If you are using git, you can also automatically configure the
......@@ -81,9 +85,6 @@ if os.getenv('SENTRY', None):
'transport': RequestsHTTPTransport,
}
# 404 logging
MIDDLEWARE.insert(0, 'raven.contrib.django.raven_compat.middleware.Sentry404CatchMiddleware')
MIDDLEWARE.insert(0, 'x_forwarded_for.middleware.XForwardedForMiddleware')
CACHES = {
......
......@@ -11,6 +11,7 @@ numpy==1.13.3
python-json-logger==0.1.8
pytz==2017.3
raven==6.3.0
requests==2.18.4
scipy==1.0.0
Unipath==1.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment