Note that diagram versions imported from another Confluence page are not directly published on the Confluence page, even if you entered the diagram editor from the Confluence page view. You can change this by clicking Publish this version now in the message box showing up directly after the import. For more information on how versions are published on the Confluence page please refer to the section "Published and Unpublished Versions" of this manual.
Importing
Import from
GitLab Bitbucket
| Status |
|---|
| colour | Blue |
|---|
| title | SERVER | DATA CENTER |
|---|
|
, GitLab Cloud | and Bitbucket | Status |
|---|
| colour | Blue |
|---|
| title | SERVER | DATA CENTER |
|---|
|
|Since BPMN-3.10.0-ENTERPRISE|,and GitHub BPMN diagrams can also be imported from your Version Control System (VCS), currently supported are GitLab or Bitbucket. This way, you can always pull in the latest revision that lies in your VCS and keep on modeling straight away in Confluence - no need to switch tools!
To import a diagram from GitLab or Bitbucket, you need to perform these 3 steps (steps 1 & 2 only need to be done once to set up the VCS connection):
Ask your
Confluence administrator to establish a connection between Confluence and GitLab or Bitbucket resp. in the app configuration of the BPMN Modeler Enterprise. While this is not yet done, you see a message like this when opening the Import from VCS
dialog. An article for admins how to establish a connection can be found in this manual in [BPMN Modeler] Features for Confluence Admins.
Image RemovedAfter the global configuration of the VCS connection, you will be asked to authenticate your GitLab account once: After that you will be able to use your own GitLab account to load .bpmn files, and thus will only see projects and files you have the right permissions for.
Image RemovedFinally, you are able to import your diagram from your Version Control System: In the BPMN Editor , you need to open the diagram editor go to File > Import from VCS,
choose GitLab or Bitbucket on the left tabbarand choose your respective VCS. Now you can search for a
projectrepository, choose a git branch or tag, and select a .bpmn file from there. To be sure, you can load a preview of the selected diagram, or you can compare it with the latest version of the BPMN diagram in Confluence (if one exists), to see the differences.
Image RemovedThe screenshot below illustrates this dialogue using GitLab as an example:
Image Added| Note |
|---|
IMPORTANT: The diagram will be copied once from |
GitLab or Bitbucket the VCS to Confluence. If you make changes in Confluence, it will not be synchronized back to the VCS. Likewise, changes and new versions from your VCS are not automatically copied to Confluence. |
| Tip |
|---|
Optional: It might happen that you import the same diagram from the same source multiple times, or even in a regular manner. For |
this these cases, you can save your search/configuration from the Import from VCS dialog as diagram settings. If you do so, these settings are suggested as a preselection the next time you come to Import from VCS. However, they can still be changed before importing the diagram. They are only meant to save you time when you are often using the same configuration. |
The default GitLab and Bitbucket VCS sources can also be managed in the Diagram Settings ( File > Settings).
Image RemovedUpload to GitLab
| Status |
|---|
| colour | Blue |
|---|
| title | SERVER | DATA CENTER |
|---|
|
|Since BPMN-3.18.0-ENTERPRISE|
You may also want to export your BPMN diagram to a remote GitLab repository. A prerequisite is that the BPMN Modeler Enterprise is connected to GitLab.
To open the export dialog, press File → Push diagram to VCS.
The upcoming dialog is very similar to the “Import from VCS” dialog. Simply select your GitLab project, select a branch, and an existing file. If you want to create a new file, select “As new File” and enter the file path, ending with the file’s name.
Image RemovedRemember that for each diagram, it is possible to specify a default GitLab project/branch/file via the diagram settings.
After pressing “Push”, the following steps are taken automatically:
A new, temporary GitLab branch named <selected branch>-BPMN-model-update is created (if it does not exist)
The changes are pushed to this temporary branch
A Merge Request is created to merge the temporary branch in the one that was actually selected (develop in the example on the right).
If the Merge Request is acceptable, it is automatically accepted, and the temporary branch is deleted.
If the Merge Request is not automatically acceptable (due to running pipelines, or a merge conflict, …) a manual merge is required. In this case, you receive the following message that leads to the GitLab Merge Request.
Image Removed
Image Added
