Implements request #38640 Pull request overview should inform about potential merge conflicts How to test: - prepare several pull requests. You can forge the merge_status column in the plugin_pullrequest_review DB table for easier repro. Prepare one pull request whose merge status is unknown (merge_status = 0), another that is no fast-forward (merge_status = 1), another that has conflicts (merge_status = 3). - prepare a broken pull request. You can forge the status (broken = 2) in the plugin_pullrequest_git_reference DB table. - As git administrator, set up the git repository so that only project administrator has write access. - As a regular user, go to the overview screen of each pull request. You should never see the Merge button. You should see the warnings and danger alerts. - As git administrator, go to Settings > Pull requests and allow only fast-forward merge. - As a regular user, you should see a warning for the pull request with merge_status = 1. Why? The errors and warnings should be visible for regular users pushing pull requests, so that they can do something about it, instead of only showing them to people that are able to merge. Change-Id: Id5accc8e868658b4f1608097c61d8e38a4eeb082

+27 −66

Author

Joris MASSON (jmasson) 2024-08-29 15:00

Committer

Joris MASSON (jmasson) 2024-08-29 15:48

Hash 45b3e7be2f0642d094957b5e5480c742f160605b

Parent dcb9ff19e2bcebc5f56bcb73bd2d3a751e5c1b3e

Reference git #tuleap/stable/45b3e7be2f0642d094957b5e5480c742f160605b