Helipad

Merge lp:~cjohnston/helipad/graphics-django-conf-urls into lp:helipad/graphics

  1. graphics-django-conf-urls
  2. Merge into graphics
Proposed by Chris Johnston
Status: Merged
Approved by: Francis Ginther
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~cjohnston/helipad/graphics-django-conf-urls
Merge into: lp:helipad/graphics
Diff against target: 15 lines (+2/-4)
1 file modified
dashboard.py (+2/-4)
To merge this branch: bzr merge lp:~cjohnston/helipad/graphics-django-conf-urls
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Francis Ginther Approve
Review via email: mp+188138@code.launchpad.net

Commit message

Switches graphics to use django.conf.urls

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:31
http://s-jenkins:8080/job/helipad-graphics-ci/39/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-graphics-ci/39/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dashboard.py'
2--- dashboard.py 2013-08-24 21:05:05 +0000
3+++ dashboard.py 2013-09-27 18:55:08 +0000
4@@ -1,9 +1,7 @@
5 from django.core.management import call_command
6 from django.core.urlresolvers import reverse_lazy
7-from django.conf.urls.defaults import include, patterns, url
8-from common.plugin_helper import (
9- Extension,
10-)
11+from django.conf.urls import include, patterns, url
12+from common.plugin_helper import Extension
13
14
15 class GraphicsExtension(Extension):

Subscribers

People subscribed via source and target branches

to all changes: