Skip to content

Notify conflict only for opened/locked merge requests

Mark Chao requested to merge 6598-notify-only-open-unmergeable-mr into master

Note to 11.0.2 picker, this can only be merged after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20042 is merged!

What does this MR do?

Scope down conflict notification to only opened/locked merge requests.

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Making the scoping prevents unuseful notifications on closed merge requests. Fixes issue of spamming: https://gitlab.com/gitlab-org/gitlab-ee/issues/6598

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ee/issues/6598

Edited by Mark Chao

Merge request reports