Canonical SSO provider

Merge lp:~james-w/canonical-identity-provider/django-timeline into lp:canonical-identity-provider/release

  1. django-timeline
  2. Merge into trunk
Proposed by James Westby
Status: Merged
Approved by: Natalia Bidart
Approved revision: no longer in the source branch.
Merged at revision: 993
Proposed branch: lp:~james-w/canonical-identity-provider/django-timeline
Merge into: lp:canonical-identity-provider/release
Diff against target: 12 lines (+1/-1)
1 file modified
django_project/wsgi.py (+1/-1)
To merge this branch: bzr merge lp:~james-w/canonical-identity-provider/django-timeline
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+179039@code.launchpad.net

Commit message

Pass the config to install_timeline_hooks in the wsgi setup.

Description of the change

Hi,

I made a mistake refactoring the code in my last branch. This fixes it.

Thanks,

James

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'django_project/wsgi.py'
2--- django_project/wsgi.py 2013-08-07 18:49:40 +0000
3+++ django_project/wsgi.py 2013-08-07 19:32:25 +0000
4@@ -45,7 +45,7 @@
5 app = timeline_make_app(app)
6
7 # Add the hooks to collect and sanitise the timeline
8-install_timeline_hooks()
9+install_timeline_hooks(config)
10
11 # Then we wrap the django app in the oops one
12 application = make_app(app, config, oops_on_status=['500'])