Merge branch 'main' into prod

Author: kuboschek

alumni/fields/year.py

@@ -29,6 +29,9 @@ class ClassField(CustomIntegerChoiceField):
     C_2023 = 2023
     C_2024 = 2024
     C_2025 = 2025
+    C_2026 = 2026
+    C_2027 = 2027
+    C_2028 = 2028
     CHOICES = (
         (OTHER, "Other (Please specify in comments)"),
         (C_2004, "Class of 2004"),
@@ -53,6 +56,9 @@ class ClassField(CustomIntegerChoiceField):
         (C_2023, "Class of 2023"),
         (C_2024, "Class of 2024"),
         (C_2025, "Class of 2025"),
+        (C_2026, "Class of 2026"),
+        (C_2027, "Class of 2027"),
+        (C_2028, "Class of 2028"),
     )
 
     DEFAULT_CHOICE = OTHER

package.json

@@ -34,7 +34,7 @@
     "vue-multiselect": "^2.1.6",
     "vue-property-decorator": "^9.1.2",
     "vue-template-compiler": "^2.6.11",
-    "webpack": "^5.36.2",
+    "webpack": "^5.94.0",
     "webpack-cli": "^4.7.0",
     "webpack4-bundle-tracker": "https://github.com/JacobsAlumni/webpack-bundle-tracker#v0.4.2-portal"
   },

poetry.lock

@@ -7,7 +7,7 @@ license = "GPL3"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-Django = "~=4.2.10"
+Django = "~=4.2.17"
 django-countries = "^7.5.0"
 django-cookie-law = "^2.2.0"
 django-impersonate = "^1.9.1"