Merge branch 'main' into fix-content-app-tests-on-macos

pydis_site/apps/api/tests/test_infractions.py

@@ -664,7 +664,10 @@ def test_unique_constraint_accepts_active_infractions_for_different_users(self):
         )
 
     def test_integrity_error_if_missing_active_field(self):
-        pattern = 'null value in column "active" violates not-null constraint'
+        pattern = (
+            'null value in column "active" (of relation "api_infraction" )?'
+            'violates not-null constraint'
+        )
         with self.assertRaisesRegex(IntegrityError, pattern):
             Infraction.objects.create(
                 user=self.user,

pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md

@@ -62,6 +62,7 @@ Run the following queries to create the user and database:
 ```sql
 CREATE USER pysite WITH SUPERUSER PASSWORD 'pysite';
 CREATE DATABASE pysite WITH OWNER pysite;
+CREATE DATABASE metricity WITH OWNER pysite;
 ```
 
 Finally, enter `/q` to exit psql.

pydis_site/apps/content/resources/guides/pydis-guides/help-channel-guide.md

@@ -32,7 +32,7 @@ If you're not sure where to post, feel free to ask us which channel is relevant
 
 Our general help channels move at a fast pace, and attract a far more diverse spectrum of helpers.
 This is a great choice for a generic Python question, and a good choice if you need an answer as soon as possible.
-It's particularly important to [ask good questions](..guides/asking-good-questions) when asking in these channels, or you risk not getting an answer and having your help channel be claimed by someone else.
+It's particularly important to [ask good questions](../asking-good-questions) when asking in these channels, or you risk not getting an answer and having your help channel be claimed by someone else.
 
 ## How To Claim a Channel