Skip to content

Commit 7d6308c

Browse files
committed
Merge branch 'main' into lint-no-floating-promises
2 parents 13e45f7 + 6261fb8 commit 7d6308c

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

packages/cli/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ We’re longtime users of Action Mailer and wanted something similar for our typ
2727

2828
To get started with Mailing, check out the [official docs](https://www.mailing.run/docs).
2929

30+
<br/>
31+
3032
## &nbsp;&nbsp;&nbsp;Contributing
3133

3234
Want to improve Mailing? Incredible. Try it out, file an issue or open a PR.

packages/web/components/docs/DocsLayout.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ export default function DocsLayout({ children }) {
9494
}
9595
)}
9696
>
97-
<h3 className="text-white text-2xl pt-7 -mb-2">Docs</h3>
97+
<Link href="/docs">
98+
<h3 className="text-white text-2xl pt-7 -mb-2">Docs</h3>
99+
</Link>
98100
<button className="hidden search border text-sm bg-gray-800 border-gray-800 text-slate-500 hover:text-blue w-full transition-all duration-300 text-left rounded-md px-2 pt-1 pb-[5px]">
99101
<svg
100102
className="fill-slate-500 transition-all duration-300 inline -mt-[3px] mr-2"

packages/web/emails/Newsletter.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const NewsletterSection = ({
2020
<MjmlColumn
2121
paddingBottom={32}
2222
paddingTop={32}
23-
borderBottom={noBorder ? "" : `1px dotted ${colors.gray500}`}
23+
borderBottom={noBorder ? null : `1px dotted ${colors.gray500}`}
2424
>
2525
{children}
2626
</MjmlColumn>

packages/web/emails/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { buildSendMail } from "mailing-core";
33

44
const transport = nodemailer.createTransport({
55
host: "email-smtp.us-east-1.amazonaws.com",
6+
pool: true,
67
port: 587,
78
auth: {
89
user: process.env.MAILING_SES_USER,

0 commit comments

Comments
 (0)