From aab35bce4d6d287c345d5ee2971c7fe666884bd5 Mon Sep 17 00:00:00 2001
From: Cesar Varela <mail@cesarvarela.com>
Date: Mon, 16 Dec 2024 17:12:24 -0300
Subject: [PATCH 1/3] Use valid auth secret for api tests (#3288)

---
 .github/workflows/test-api.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-api.yml b/.github/workflows/test-api.yml
index 12df1bfa15..e2959f6f19 100644
--- a/.github/workflows/test-api.yml
+++ b/.github/workflows/test-api.yml
@@ -71,7 +71,7 @@ jobs:
           NOTIFICATIONS_SENDER: test@test.com
           SITE_URL: http://localhost:8000
           NEXTAUTH_URL: http://localhost:8000
-          NEXTAUTH_SECRET: dummy
+          NEXTAUTH_SECRET: 678x1irXYWeiOqTwCv1awvkAUbO9eHa5xzQEYhxhMms=
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4

From d751272d13a29d5cfa31c55f1bf6a918d64f81e0 Mon Sep 17 00:00:00 2001
From: Kevin <kepae@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:12:06 -0300
Subject: [PATCH 2/3] Add dependabot configuration to target staging branch
 (#3280)

* Add dependabot configuration to target staging branch

* Add documentation link
---
 .github/dependabot.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..7920e5729b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# Configure Dependabot to target the staging branch of this repository.
+# See configuration options:
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: "staging"
+    schedule:
+      interval: "weekly"

From ef1846de7a51f6f4e1695afa17c80db7a74a5edc Mon Sep 17 00:00:00 2001
From: Luna McNulty <l.mcnulty@riseup.net>
Date: Wed, 18 Dec 2024 12:46:56 -0500
Subject: [PATCH 3/3] =?UTF-8?q?Email=20templates=20=E2=80=93=20Fallback=20?=
 =?UTF-8?q?to=20sans-serif,=20reduce=20horizontal=20padding=20(#3292)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use sans-serif fallback for email templates

* Reduce horizontal padding, update import for test script
---
 site/gatsby-site/server/emails/templates/shared.ts | 4 ++--
 site/gatsby-site/src/scripts/sendEmailTest.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/gatsby-site/server/emails/templates/shared.ts b/site/gatsby-site/server/emails/templates/shared.ts
index 97beffda1b..130d9adcc8 100644
--- a/site/gatsby-site/server/emails/templates/shared.ts
+++ b/site/gatsby-site/server/emails/templates/shared.ts
@@ -35,7 +35,7 @@ const insertContent= (content: string, variables: any): string  => {
 						AI INCIDENT DATABASE
 					</div>
 				</div>
-				<div style="padding: 32px;">
+				<div style="padding: 32px 8px;">
           ${content}
 				</div>
 			</div>
@@ -47,7 +47,7 @@ const insertContent= (content: string, variables: any): string  => {
 // These styles will be used across multiple email templates,
 // so they get defined outside the getTemplate function.
 const bodyStyle: string = ignoreWhitespace(`
-  font-family: karla; 
+  font-family: karla, sans-serif; 
   padding: 16px;
 `);
 
diff --git a/site/gatsby-site/src/scripts/sendEmailTest.js b/site/gatsby-site/src/scripts/sendEmailTest.js
index 73b7fecc29..1f7004287c 100644
--- a/site/gatsby-site/src/scripts/sendEmailTest.js
+++ b/site/gatsby-site/src/scripts/sendEmailTest.js
@@ -1,4 +1,4 @@
-import { sendEmail } from '../../server/fields/common.ts';
+import { sendEmail } from '../../server/emails';
 
 // from site/gatsby-site, run with
 // TEST_EMAIL_TO_ADDRESS=<address> dotenv run <path to>/npx ts-node src/scripts/sendEmailTest.js