Merge v2.5 work

netbox/extras/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion

netbox/extras/migrations/0001_initial_squashed_0010_customfield_filter_logic.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:19
-from __future__ import unicode_literals
 
 from django.conf import settings
 import django.contrib.postgres.fields.jsonb

netbox/extras/migrations/0002_custom_fields.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-08-23 20:33
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/extras/migrations/0003_exporttemplate_add_description.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-09-27 20:20
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/extras/migrations/0004_topologymap_change_comma_to_semicolon.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-11-03 18:33
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/extras/migrations/0005_useraction_add_bulk_create.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-04-04 19:45
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/extras/migrations/0006_add_imageattachments.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-04-04 19:58
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 import extras.models

netbox/extras/migrations/0007_unicode_literals.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-05-24 15:34
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import extras.models
 

netbox/extras/migrations/0008_reports.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-26 21:25
-from __future__ import unicode_literals
 
 from django.conf import settings
 import django.contrib.postgres.fields.jsonb

netbox/extras/migrations/0009_topologymap_type.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.9 on 2018-02-15 16:28
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/extras/migrations/0010_customfield_filter_logic.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.9 on 2018-02-21 19:48
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 from extras.constants import CF_FILTER_DISABLED, CF_FILTER_EXACT, CF_FILTER_LOOSE, CF_TYPE_SELECT

netbox/extras/migrations/0012_webhooks.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-05-30 17:55
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/extras/migrations/0013_objectchange.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-06-22 18:13
-from __future__ import unicode_literals
-
 from django.conf import settings
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models

netbox/extras/migrations/0015_remove_useraction.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.0.8 on 2018-08-14 16:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0014_configcontexts'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='useraction',
+            name='content_type',
+        ),
+        migrations.RemoveField(
+            model_name='useraction',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='UserAction',
+        ),
+    ]

netbox/extras/migrations/0016_exporttemplate_add_cable.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.1.3 on 2018-11-07 20:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0015_remove_useraction'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exporttemplate',
+            name='content_type',
+            field=models.ForeignKey(limit_choices_to={'model__in': ['provider', 'circuit', 'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device', 'consoleport', 'powerport', 'interface', 'cable', 'virtualchassis', 'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service', 'secret', 'tenant', 'cluster', 'virtualmachine']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
+        ),
+    ]