encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 20:40:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge f8915abe2c into 99382f3ccb

Browse Source
This commit is contained in:
Daniel Correa 2017-05-31 15:29:23 +00:00 committed by GitHub
commit be85f903eb
2 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rest_framework/authtoken/migrations/0001_initial.py
View File

@ -15,12 +15,11 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Token',
fields=[
('key', models.CharField(primary_key=True, serialize=False, max_length=40)),
('created', models.DateTimeField(auto_now_add=True)),
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, related_name='auth_token', on_delete=models.CASCADE)),
('key', models.CharField(verbose_name='Key', primary_key=True, serialize=False, max_length=40)),
('created', models.DateTimeField(verbose_name='Created', auto_now_add=True)),
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, verbose_name='User', related_name='auth_token')),
],
options={
},
options={'verbose_name_plural': 'Tokens', 'verbose_name': 'Token'},
bases=(models.Model,),
),
]

34
rest_framework/authtoken/migrations/0002_auto_20160226_1747.py
View File

@ -1,34 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('authtoken', '0001_initial'),
]
operations = [
migrations.AlterModelOptions(
name='token',
options={'verbose_name_plural': 'Tokens', 'verbose_name': 'Token'},
),
migrations.AlterField(
model_name='token',
name='created',
field=models.DateTimeField(verbose_name='Created', auto_now_add=True),
),
migrations.AlterField(
model_name='token',
name='key',
field=models.CharField(verbose_name='Key', max_length=40, primary_key=True, serialize=False),
),
migrations.AlterField(
model_name='token',
name='user',
field=models.OneToOneField(to=settings.AUTH_USER_MODEL, verbose_name='User', related_name='auth_token', on_delete=models.CASCADE),
),
]