Canonical SSO provider

Merge ~bloodearnest/canonical-identity-provider/+git/canonical-identity-provider:actually-disable-sentry-hook into canonical-identity-provider:master

  1. Git
  2. lp:~bloodearnest/canonical-identity-provider/+git/canonical-identity-provider
  3. actually-disable-sentry-hook
  4. Merge into master
Proposed by Simon Davy
Status: Merged
Approved by: Simon Davy
Approved revision: 1854865eb9bca9a35a087c2b8cd1f033097cabce
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~bloodearnest/canonical-identity-provider/+git/canonical-identity-provider:actually-disable-sentry-hook
Merge into: canonical-identity-provider:master
Diff against target: 13 lines (+1/-1)
1 file modified
django_project/settings_base.py (+1/-1)
Reviewer Review Type Date Requested Status
Simon Davy (community) Approve
Daniel Manrique (community) Approve
Review via email: mp+383722@code.launchpad.net

Commit message

use proper config directive to disable sql hook

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

+1, let's try it.

review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/canonical-identity-provider/328/

Revision history for this message
Simon Davy (bloodearnest) :
review: Approve
Revision history for this message
Simon Davy (bloodearnest) wrote :

Failed linting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/django_project/settings_base.py b/django_project/settings_base.py
2index 576312c..055c5f0 100644
3--- a/django_project/settings_base.py
4+++ b/django_project/settings_base.py
5@@ -499,7 +499,7 @@ SECURE_PROXY_SSL_HEADER = None
6 SECURE_SSL_REDIRECT = False
7 SEND_BROKEN_LINK_EMAILS = False
8 SENTRY_CELERY_LOGLEVEL = logging.WARN
9-SENTRY_INSTALL_SQL_HOOK = False
10+SENTRY_CONFIG = {'install_sql_hook': False}
11 SERVER_EMAIL = 'noreply@ubuntu.com'
12 SESSION_CACHE_ALIAS = 'default'
13 SESSION_COOKIE_AGE = 1209600

Subscribers

People subscribed via source and target branches