Merge lp:~joetalbott/qa-dashboard/staticfiles_locally into lp:qa-dashboard

Proposed by Joe Talbott
Status: Merged
Approved by: Joe Talbott
Approved revision: 751
Merged at revision: 760
Proposed branch: lp:~joetalbott/qa-dashboard/staticfiles_locally
Merge into: lp:qa-dashboard
Diff against target: 20 lines (+3/-1)
1 file modified
qa_dashboard/urls.py (+3/-1)
To merge this branch: bzr merge lp:~joetalbott/qa-dashboard/staticfiles_locally
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Canonical CI Engineering Pending
Review via email: mp+228675@code.launchpad.net

Commit message

fix static url for development instances.

Description of the change

fix static url for development instances.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:751
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/349/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/349/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qa_dashboard/urls.py'
--- qa_dashboard/urls.py 2013-10-21 20:06:21 +0000
+++ qa_dashboard/urls.py 2014-07-29 13:33:23 +0000
@@ -20,6 +20,8 @@
20from django.contrib import admin20from django.contrib import admin
21admin.autodiscover()21admin.autodiscover()
2222
23from qa_dashboard import settings
24
23urlpatterns = patterns(25urlpatterns = patterns(
24 '',26 '',
25 url(r'^$', 'common.views.index', name='index'),27 url(r'^$', 'common.views.index', name='index'),
@@ -36,7 +38,7 @@
36 (38 (
37 r'^static/(?P<path>.*)$',39 r'^static/(?P<path>.*)$',
38 'django.views.static.serve',40 'django.views.static.serve',
39 {'document_root': 'static'}41 {'document_root': settings.STATIC_ROOT}
40 )42 )
41 )43 )
4244

Subscribers

People subscribed via source and target branches