From e0ce5e83fcc7637e82bd60d651a0389969aaf1ee Mon Sep 17 00:00:00 2001
From: Mads Nylund <73914541+MadsNyl@users.noreply.github.com>
Date: Fri, 22 Sep 2023 09:22:08 +0200
Subject: [PATCH 1/2] added search bar for admin site for memberships (#704)

---
 app/group/admin.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/group/admin.py b/app/group/admin.py
index c9242acf4..44eda2aa4 100644
--- a/app/group/admin.py
+++ b/app/group/admin.py
@@ -24,6 +24,11 @@ class MembershipAdmin(admin.ModelAdmin):
         "user",
     )
 
+    search_fields = [
+        "user__first_name",
+        "user__last_name"
+    ]
+
 
 @admin.register(models.MembershipHistory)
 class MembershipHistoryAdmin(admin.ModelAdmin):

From c38511c04bd095f9255fd02058e7ddfbd7b02fd2 Mon Sep 17 00:00:00 2001
From: "Thomas H. Svendal" <thomassvendal@gmail.com>
Date: Mon, 2 Oct 2023 18:17:48 +0200
Subject: [PATCH 2/2] Updated python image, MySQL, django, django rest (#692)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 compose/Dockerfile | 2 +-
 docker-compose.yml | 8 ++++----
 requirements.txt   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compose/Dockerfile b/compose/Dockerfile
index 88a0015b4..3e7579d93 100644
--- a/compose/Dockerfile
+++ b/compose/Dockerfile
@@ -2,7 +2,7 @@
 # The `dev`-stage installs dependencies copies the required files, waits for the database connection
 # and runs the server in "development-mode".
 # Use --target=dev to only use this stage.
-FROM python:3.9-slim-buster as dev
+FROM python:3.11-slim-bullseye as dev
 ENV PYTHONUNBUFFERED 1
 
 WORKDIR /usr/src
diff --git a/docker-compose.yml b/docker-compose.yml
index 00934d4c2..6bf689022 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '3.8'
+version: "3.8"
 
 services:
   db:
-    image: mysql:5.7
+    image: mysql:8.0
     container_name: db
     platform: linux/amd64
     restart: always
@@ -21,7 +21,7 @@ services:
     image: phpmyadmin/phpmyadmin
     restart: always
     ports:
-      - '8080:80'
+      - "8080:80"
     environment:
       PMA_HOST: db
       MYSQL_ROOT_PASSWORD: password
@@ -56,4 +56,4 @@ services:
     image: rabbitmq:3.9.13
     container_name: rabbitmq
     ports:
-        - 5672:5672
+      - 5672:5672
diff --git a/requirements.txt b/requirements.txt
index 64e63f1e0..89dc0a813 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,13 +15,13 @@ slack-sdk == 3.19.3
 
 # Django
 # ------------------------------------------------------------------------------
-Django==4.0.8
+Django==4.2.5
 django-enumchoicefield == 3.0.0
 django-filter == 22.1
 django-ordered-model~=3.6
 
 # Django REST Framework
-djangorestframework==3.13.1
+djangorestframework==3.14.0
 django-cors-headers
 dj-rest-auth == 2.2.3