Skip to content

Move logic when change_response_code_merge_status FF is off

Marc Shaw requested to merge add_back_mergeable_check into master

What does this MR do and why?

Due to the complexity around the usage of mergeable_state? vs mergeable?, we need to add the previous change back to where the checks were in mergeable? rather than mergeable_state? for when the feature flag is off.

What was happening is that with the feature flag off, the frontend was somewhere getting a 'discussions resolved' false and showing an error message when trying to merge/blocking the merge button even though they were all resolved.

This resulted from a QA failure: #358070 (closed)

Screenshots or screen recordings

These are strongly recommended to assist reviewers and reduce the time to merge your change.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Marc Shaw

Merge request reports