part of story #31186 Add management of "Merge" This contribution introduces a functional merge button. It is disabled when it is not possible to merge the PR, and enabled when it is. When clicked, the PR is merged. On error, the error modal opens. Please note that there is no warning modal or "Already merged" state yet. It will be added in a dedicated contribution. How to test: - When the user has not the right to merge, or the pull-request is already merged --> There is no merge button - When the pull request: -- is not fast-forward but merge commits are allowed --> The button is outlined and not disabled -- is not fast-forward and merge commits are disabled --> The button is outlined and disabled --> An error is displayed -- has a merge conflict --> The button is outlined and disabled --> An error is displayed -- has an unknown destination --> The button is disabled and outlined --> A warning is displayed -- has its source and destination references being the same --> The button is disabled and outlined --> A warning is displayed -- is fast forward but with a not successful CI status --> The button is outlined and not disabled -- is fast forward with a successful CI status --> The button is NOT outlined and NOT disabled --> Clicking the merge button merges the pull-request --> After a successful merge, the button disappears --> After a merge error, the error modal opens Change-Id: Id8a23764e17edbafabea60c539540770d3bf86c2

+959 −43

Author

Thomas Gorka (tgorka) 2023-03-21 16:52

Committer

Thomas Gorka (tgorka) 2023-03-24 11:31

Hash 952d6d17358ea4506d7fe4d4a597478ee2a2e749

Parent b1f8d0f9b1af6623d99a217c430537b6bd87836f

Reference git #tuleap/stable/952d6d17358ea4506d7fe4d4a597478ee2a2e749