Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for Mermaid diagrams in ADRs #45

Merged
merged 6 commits into from
Oct 8, 2023

Conversation

colindean
Copy link
Contributor

Create a codeblock with mermaid as the language tag and it'll render.

See the new test ADR for an example.

Create a codeblock with mermaid as the language tag and it'll render.

See the new test ADR for an example.
@mrwilson
Copy link
Owner

mrwilson commented Sep 9, 2023

This looks great! One comment on the versioning of the mermaid JS import.

@colindean
Copy link
Contributor Author

Ok, looks like the changes are rather large, so I'll have to set aside some time to look at it more closely at some point in the next week or so.

@mrwilson
Copy link
Owner

No worries at all - any contributions are appreciated. After you've landed it, I'll kick up RC2 with this and the latest changes I've made, then if it all looks good I'll release 1.5.0 soon after that.

@colindean
Copy link
Contributor Author

I think this is ready to go now. GH is saying This branch cannot be rebased due to conflicts but upstream/master is fully merged into this branch…

@mrwilson mrwilson marked this pull request as draft October 8, 2023 12:28
@mrwilson mrwilson marked this pull request as ready for review October 8, 2023 12:28
@mrwilson
Copy link
Owner

mrwilson commented Oct 8, 2023

Yeah, this is rebase problems from my model refactoring.

I've switched the project to allow merge commits temporarily, which GitHub is happy with (I can see the big green "Merge pull request" button), and will fold it in.

Thank you for the change!

@mrwilson mrwilson merged commit 6543005 into mrwilson:master Oct 8, 2023
8 checks passed
@colindean colindean deleted the 36-mermaid branch October 10, 2023 03:47
@colindean
Copy link
Contributor Author

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants