[go: up one dir, main page]
Skip to content

Improve user experience when an MR is blocked by a locked file

Issue

When a file lock prevents an MR being merged, there are two issues:

  1. The Merge button is available when it's not possible to merge the MR.
  2. The associated message is misleading.

The current message is as follows:

image

There are several issues with this message:

  1. It suggests that the issue is temporary, and that retrying the merge will correct the situation. If I understand correctly, only removing the file's lock will correct the situation, allowing the MR to be merged.
  2. The message starts Something went wrong..., indicating the cause of the failure is not certain. In fact the cause is known, and details are provided.
  3. In this instance it's not entirely clear that Gadoo Gadah is a GitLab user's name.

Suggestion

  1. Don't show the Merge button when a file contained in the MR is locked.

  2. Improve the associated message, perhaps:

    Merge request cannot be merged because file is locked. Check if the file's lock can be removed and if so, try the merge again.