Skip to content

Docs: convert git graphs for merge methods to mermaid

Piotr Stankowski requested to merge trakos/gitlab:merge-methods-mermaid into master

What does this MR do and why?

Documentation for merge methods contains images of example git history. Changing them requires recreating an example repository again.

Mermaid supports git graphs: https://mermaid-js.github.io/mermaid/#/gitgraph I remember seeing mention of it in the comments of my original MR that added this page: !86309 (merged)

So, I thought we could convert this git history graphs to mermaid, in order to make changing them easier.

In issue #362111 one task is to show before and after, so it should be easier to do once we have graphs in mermaid format.

GitLab recently merged my other MR, gitlab-docs!2920 (merged), which fixed git diagrams styles.

Screenshots or screen recordings

before after
image image
image image
image image

How to set up and validate locally

Visit the merge methods page in docs, for example: http://localhost:3005/ee/user/project/merge_requests/methods/

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Piotr Stankowski

Merge request reports