diff --git a/helpdesk/migrations/0003_populate_usersettings.py b/helpdesk/migrations/0002_populate_usersettings.py similarity index 97% rename from helpdesk/migrations/0003_populate_usersettings.py rename to helpdesk/migrations/0002_populate_usersettings.py index 36b98310..ba2979be 100644 --- a/helpdesk/migrations/0003_populate_usersettings.py +++ b/helpdesk/migrations/0002_populate_usersettings.py @@ -43,7 +43,7 @@ noop = lambda *args, **kwargs: None class Migration(migrations.Migration): dependencies = [ - ('helpdesk', '0002_socks_proxy'), + ('helpdesk', '0001_initial'), ] operations = [ diff --git a/helpdesk/migrations/0002_socks_proxy.py b/helpdesk/migrations/0002_socks_proxy.py deleted file mode 100644 index 468af823..00000000 --- a/helpdesk/migrations/0002_socks_proxy.py +++ /dev/null @@ -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, - ), - ] diff --git a/helpdesk/migrations/0004_initial_data_import.py b/helpdesk/migrations/0003_initial_data_import.py similarity index 95% rename from helpdesk/migrations/0004_initial_data_import.py rename to helpdesk/migrations/0003_initial_data_import.py index e64f4112..566993e0 100644 --- a/helpdesk/migrations/0004_initial_data_import.py +++ b/helpdesk/migrations/0003_initial_data_import.py @@ -36,7 +36,7 @@ def unload_fixture(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('helpdesk', '0003_populate_usersettings'), + ('helpdesk', '0002_populate_usersettings'), ] operations = [