zaquestion / lab

Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab
https://zaquestion.github.io/lab
Creative Commons Zero v1.0 Universal
1.11k stars 102 forks source link

lab mr merge does not work #818

Open BradyHu opened 2 years ago

BradyHu commented 2 years ago

the lab version is 0.24.0 the gitlab version is GitLab Community Edition 13.12.15

(ez-sdk-IyrY50Hh-py3.9) (base) ➜ ez-sdk git:(CI) ✗ lab mr create origin master -m "docker file" https://gitlab.citydnatech.com/ez.cloud/ez-sdk/-/merge_requests/5/diffs (ez-sdk-IyrY50Hh-py3.9) (base) ➜ ez-sdk git:(CI) ✗ (ez-sdk-IyrY50Hh-py3.9) (base) ➜ ez-sdk git:(CI) ✗ lab mr merge
2022/03/25 09:01:18 ERROR: mr_merge.go:40: PUT https://gitlab.citydnatech.com/api/v4/projects/ez.cloud/ez-sdk/merge_requests/5/merge: 405 {message: 405 Method Not Allowed} (ez-sdk-IyrY50Hh-py3.9) (base) ➜ ez-sdk git:(CI) ✗

it seems that api has been changed, how can i fix it?

BradyHu commented 2 years ago

it seems that /api/v4/projects//merge_requests//merge has been changed to /merge_requests//merge

bmeneg commented 2 years ago

Oh! Ok, that's interesting, I didn't notice nor saw any changelog on gitlab side about this change. I'll check it.

Thanls for te report!

zampierilucas commented 2 years ago

I don't think this is a lab issue as 405 means:

The merge request cannot be accepted because it is Draft, Closed, Pipeline Pending Completion, or Failed. Success is required.

[1] https://docs.gitlab.com/ee/api/merge_requests.html#:~:text=accept%20this%20merge%20request.-,405,-Method%20Not%20Allowed

zampierilucas commented 2 years ago

Alternatively, you can force lab to merge a mr with -i, --immediate merge immediately, regardless pipeline results