Merge pull request #1421 from epicwhale/update-django-1.11.8-to-2.0

Upgrade Django to 2.0
This commit is contained in:
Bruno Alla 2018-02-16 21:37:06 +00:00 committed by GitHub
commit 642af90a37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View File

@ -6,7 +6,7 @@ wheel==0.30.0
# Conservative Django
django==1.11.10 # pyup: <2.0
django==2.0 # pyup: < 2.1
# Configuration
django-environ==0.4.4

View File

@ -22,7 +22,7 @@ class Migration(migrations.Migration):
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')),
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),

View File

@ -2,6 +2,7 @@ from django.conf.urls import url
from . import views
app_name = 'users'
urlpatterns = [
url(
regex=r'^$',