mirror of
				https://github.com/mermaid-js/mermaid.git
				synced 2025-11-03 20:34:20 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/release/9.1.7' into sidv/mergeRelease
* origin/release/9.1.7: Release 9.1.7 Fix for broken rendering test Fix for issue #3428, load the configured diagrams even when initialize has not been called.
This commit is contained in:
		@@ -38,7 +38,15 @@
 | 
			
		||||
    </style>
 | 
			
		||||
  </head>
 | 
			
		||||
  <body>
 | 
			
		||||
    <pre class="mermaid2" style="width: 50%">
 | 
			
		||||
flowchart LR
 | 
			
		||||
  a ---
 | 
			
		||||
    </pre>
 | 
			
		||||
    <pre class="mermaid" style="width: 50%">
 | 
			
		||||
flowchart LR
 | 
			
		||||
  a2 ---
 | 
			
		||||
    </pre>
 | 
			
		||||
    <pre class="mermaid2" style="width: 50%">
 | 
			
		||||
flowchart LR
 | 
			
		||||
  classDef aPID stroke:#4e4403,fill:#fdde29,color:#4e4403,rx:5px,ry:5px;
 | 
			
		||||
  classDef crm stroke:#333333,fill:#DCDCDC,color:#333333,rx:5px,ry:5px;
 | 
			
		||||
@@ -73,7 +81,31 @@ flowchart TD
 | 
			
		||||
    </pre>
 | 
			
		||||
    <pre class="mermaid" style="width: 50%">
 | 
			
		||||
flowchart TD
 | 
			
		||||
id
 | 
			
		||||
 | 
			
		||||
  release-branch[Create Release Branch]:::relClass
 | 
			
		||||
  develop-branch[Update Develop Branch]:::relClass
 | 
			
		||||
  github-release-draft[GitHub Release Draft]:::relClass
 | 
			
		||||
  trigger-pipeline[Trigger Jenkins pipeline]:::fixClass
 | 
			
		||||
  github-release[GitHub Release]:::postClass
 | 
			
		||||
 | 
			
		||||
  build-ready --> release-branch
 | 
			
		||||
  build-ready --> develop-branch
 | 
			
		||||
  release-branch --> jenkins-release-build
 | 
			
		||||
  jenkins-release-build --> github-release-draft
 | 
			
		||||
  jenkins-release-build --> install-release
 | 
			
		||||
  install-release --> verify-release
 | 
			
		||||
  jenkins-release-build --> announce
 | 
			
		||||
  github-release-draft --> github-release
 | 
			
		||||
  verify-release --> verify-check
 | 
			
		||||
  verify-check -- Yes --> github-release
 | 
			
		||||
  verify-check -- No --> release-fix
 | 
			
		||||
  release-fix --> release-branch-pr
 | 
			
		||||
  verify-check -- No --> delete-artifacts
 | 
			
		||||
  release-branch-pr --> trigger-pipeline
 | 
			
		||||
  delete-artifacts --> trigger-pipeline
 | 
			
		||||
  trigger-pipeline --> jenkins-release-build
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    </pre>
 | 
			
		||||
    <pre class="mermaid2" style="width: 50%">
 | 
			
		||||
flowchart LR
 | 
			
		||||
@@ -357,6 +389,11 @@ flowchart TD
 | 
			
		||||
 | 
			
		||||
        document.getElementsByTagName('body')[0].appendChild(div);
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      mermaid.parseError = function (err, hash) {
 | 
			
		||||
        console.error('In parse error:');
 | 
			
		||||
        console.error(err);
 | 
			
		||||
      };
 | 
			
		||||
    </script>
 | 
			
		||||
  </body>
 | 
			
		||||
</html>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user