From badd8922fb3cb4e0769b4791c398480c8d4a3a71 Mon Sep 17 00:00:00 2001
From: Zac Bohon <startswithz@gmail.com>
Date: Mon, 2 Aug 2021 23:41:36 -0500
Subject: [PATCH 1/2] Added DEFAULT_AUTO_FIELD to settings.py

Resolves warnings thrown by PyTest.

see https://dev.to/weplayinternet/upgrading-to-django-3-2-and-fixing-defaultautofield-warnings-518n
---
 brutaldon/settings.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/brutaldon/settings.py b/brutaldon/settings.py
index f7f80c2..5fe9ea0 100644
--- a/brutaldon/settings.py
+++ b/brutaldon/settings.py
@@ -211,5 +211,8 @@ def CHECK_INSTANCE_URL(url, redirect):
         return redirect(RICKROLL_URL)
 
 
+# See https://dev.to/weplayinternet/upgrading-to-django-3-2-and-fixing-defaultautofield-warnings-518n
+DEFAULT_AUTO_FIELD='django.db.models.AutoField'
+
 # Version number displayed on about page
 BRUTALDON_VERSION = "2.15.0"

From 2131b9da3f6462b5c66b88158973b7973e469316 Mon Sep 17 00:00:00 2001
From: Zachery Bohon <startswithz@gmail.com>
Date: Tue, 3 Aug 2021 04:45:35 +0000
Subject: [PATCH 2/2] Add .gitlab-ci.yml

---
 .gitlab-ci.yml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..c8ac6b5
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,56 @@
+# This file is a template, and might need editing before it works on your project.
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Django.gitlab-ci.yml
+
+# Official framework image. Look for the different tagged releases at:
+# https://hub.docker.com/r/library/python
+image: python:latest
+
+# Pick zero or more services to be used on all builds.
+# Only needed when using a docker container to run your tests in.
+# Check out: http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
+services:
+  # - mysql:latest
+  # - postgres:latest
+
+variables:
+  # POSTGRES_DB: database_name
+
+# This folder is cached between builds
+# https://docs.gitlab.com/ee/ci/yaml/index.html#cache
+cache:
+  paths:
+    - ~/.cache/pip/
+
+# This is a basic example for a gem or script which doesn't use
+# services such as redis or postgres
+before_script:
+  - python -V  # Print out python version for debugging
+  # Uncomment next line if your Django app needs a JS runtime:
+  # - apt-get update -q && apt-get install nodejs -yqq
+  - pip install pipenv
+  - pipenv install
+
+# To get Django tests to work you may need to create a settings file using
+# the following DATABASES:
+#
+# DATABASES = {
+#     'default': {
+#        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+#        'NAME': 'ci',
+#        'USER': 'postgres',
+#        'PASSWORD': 'postgres',
+#        'HOST': 'postgres',
+#        'PORT': '5432',
+#    },
+# }
+#
+# and then adding `--settings app.settings.ci` (or similar) to the test command
+
+test:
+  variables:
+    DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
+  script:
+    - pipenv run python manage.py test