Remove migration 0002_socks_proxy.py which has been squashed into 0001, rename migrations 0003 and 0004 and update their dependencies accordingly

This commit is contained in:
Jonathan Barratt 2015-06-03 12:39:02 +07:00
parent 1ff45f4e1b
commit f434292cfc
3 changed files with 2 additions and 34 deletions

View File

@ -43,7 +43,7 @@ noop = lambda *args, **kwargs: None
class Migration(migrations.Migration):
dependencies = [
('helpdesk', '0002_socks_proxy'),
('helpdesk', '0001_initial'),
]
operations = [

View File

@ -1,32 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('helpdesk', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='queue',
name='socks_proxy_host',
field=models.GenericIPAddressField(help_text='Socks proxy IP address. Default: 127.0.0.1', null=True, verbose_name='Socks Proxy Host', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='queue',
name='socks_proxy_port',
field=models.IntegerField(help_text='Socks proxy port number. Default: 9150 (default TOR port)', null=True, verbose_name='Socks Proxy Port', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='queue',
name='socks_proxy_type',
field=models.CharField(choices=[(b'socks4', 'SOCKS4'), (b'socks5', 'SOCKS5')], max_length=8, blank=True, help_text='SOCKS4 or SOCKS5 allows you to proxy your connections through a SOCKS server.', null=True, verbose_name='Socks Proxy Type'),
preserve_default=True,
),
]

View File

@ -36,7 +36,7 @@ def unload_fixture(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('helpdesk', '0003_populate_usersettings'),
('helpdesk', '0002_populate_usersettings'),
]
operations = [