stable
Clone or download
part of story #31186 Add management of "Merge" How to test: - In a fast-forward pull-request where the last CI status is "success", click on the merge button --> The pull-request is merged right away - In a fast-forward pull-request where the last CI status is not "success", click on the merge button --> The modal opens --> It contains one warning about the CI status - In a not fast-forward pull-request where the last CI status is "success", click on the merge button --> The modal opens --> It contains a warning about the not fast-forward merge - In a not fast-forward pull-request where the last CI status is not "success", click on the merge button --> The modal opens --> It contains a warning about the not fast-forward merge --> It contains one warning about the CI status - Clicking on merge anyway will close the modal, and the merge will be processed. - If an arror occurres, the error modal opens Change-Id: Ia43bea437bb7647350494583da70611cf92de8b7
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | plugins/pullrequest/scripts/pullrequest-overview/po/fr_FR.po | +40 | −0 | Go to diff View file |
| M | plugins/pullrequest/scripts/pullrequest-overview/src/components/Actions/PullRequestMergeButton.test.ts | +52 | −3 | Go to diff View file |
| M | plugins/pullrequest/scripts/pullrequest-overview/src/components/Actions/PullRequestMergeButton.vue | +62 | −29 | Go to diff View file |
| M | plugins/pullrequest/scripts/pullrequest-overview/src/components/Modals/PullRequestErrorModal.vue | +1 | −1 | Go to diff View file |
| A | plugins/pullrequest/scripts/pullrequest-overview/src/components/Modals/PullRequestMergeWarningModal.test.ts | +139 | −0 | Go to diff View file |
| A | plugins/pullrequest/scripts/pullrequest-overview/src/components/Modals/PullRequestMergeWarningModal.vue | +183 | −0 | Go to diff View file |