From d4a2c1f8792f52fec0c881ab38c91635840a50c0 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 7 Apr 2015 22:20:53 +0100 Subject: Integrate 'django.contrib.staticfiles' Rather than providing a custom solution for serving static files, use the solution provided in the upstream Django source. This allows us to remove the top-level 'urls.py' file. Signed-off-by: Stephen Finucane Signed-off-by: Jeremy Kerr --- apps/patchwork/urls.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'apps/patchwork/urls.py') diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py index 9b681f9..b28eb90 100644 --- a/apps/patchwork/urls.py +++ b/apps/patchwork/urls.py @@ -17,12 +17,16 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from django.conf.urls import patterns, url +from django.conf.urls import patterns, url, include from django.conf import settings +from django.contrib import admin from django.contrib.auth import views as auth_views +admin.autodiscover() + urlpatterns = patterns('', - # Example: + url(r'^admin/', include(admin.site.urls)), + (r'^$', 'patchwork.views.projects'), (r'^project/(?P[^/]+)/list/$', 'patchwork.views.patch.list'), (r'^project/(?P[^/]+)/$', 'patchwork.views.project.project'), -- cgit v1.2.3