Merge branch 'django' into django+200/wiki

# Conflicts:
#	Pipfile.lock
#	pydis_site/apps/home/tests.py

1 files changed, 15 insertions, 7 deletions

diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 9a92313a..8f045044 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -1,16 +1,15 @@
 from rest_framework.serializers import ModelSerializer, PrimaryKeyRelatedField, ValidationError
-from rest_framework.validators import UniqueValidator
 from rest_framework_bulk import BulkSerializerMixin
 
 from .models import (
     BotSetting, DeletedMessage,
     DocumentationLink, Infraction,
-    MessageDeletionContext, Nomination,
-    OffTopicChannelName, Reminder,
-    Role, SnakeFact,
-    SnakeIdiom, SnakeName,
-    SpecialSnake, Tag,
-    User
+    LogEntry, MessageDeletionContext,
+    Nomination, OffTopicChannelName,
+    Reminder, Role,
+    SnakeFact, SnakeIdiom,
+    SnakeName, SpecialSnake,
+    Tag, User
 )
 
 
@@ -102,6 +101,15 @@ class ExpandedInfractionSerializer(InfractionSerializer):
         return ret
 
 
+class LogEntrySerializer(ModelSerializer):
+    class Meta:
+        model = LogEntry
+        fields = (
+            'application', 'logger_name', 'timestamp',
+            'level', 'module', 'line', 'message'
+        )
+
+
 class OffTopicChannelNameSerializer(ModelSerializer):
     class Meta:
         model = OffTopicChannelName