Merge pull request #23 from dotkom/upgrade/django2

Upgrade to Django version 2.0
dotkom · Oct 19, 2018 · c26e120 · c26e120
2 parents cddbff5 + 4ba59ae
commit c26e120
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/redwine/models.py b/redwine/models.py
@@ -7,8 +7,8 @@
 
 class Penalty(models.Model):
 
-    to =        models.ForeignKey(settings.AUTH_USER_MODEL, related_name='penalties')
-    giver =     models.ForeignKey(settings.AUTH_USER_MODEL, related_name='penaltygiver')
+    to =        models.ForeignKey(settings.AUTH_USER_MODEL, related_name='penalties', on_delete=models.CASCADE)
+    giver =     models.ForeignKey(settings.AUTH_USER_MODEL, related_name='penaltygiver', on_delete=models.CASCADE)
     amount =    models.PositiveIntegerField()
     committee = models.CharField(max_length=60)
     reason =    models.CharField(max_length=100)

diff --git a/redwine/urls.py b/redwine/urls.py
@@ -7,6 +7,6 @@
     url(r'^top/$', redwine_top),
     url(r'^(\w+)/$', redwine_com),
     url(r'^$', redwine_home),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     # (r'accounts/login/',include(admin.site.urls)),
 ]
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-Django==1.11
+Django==2.0.9