Merge Request is failing with squash option on certain projects
Summary
Merge Request fails when squash
option is on.
Steps to reproduce
- Open a new merge request from a branch without any changes;
- Mark that merge request to squash commits and remove source branch on merge (the given repository is set to perform Fast-forward merge without a merge commit);
- Add a couple of commits to the new branch and push them to gitlab;
- Perform any necessary approvals on the merge request and click merge;
-
gitlab won't perform the merge and will show the message
Failed to squash. Should be done manually.. Refreshing in 10 seconds to show the updated status...
Example Project
Here it happens https://gitlab.com/fpftech.diamond/infra/merge_requests/30
Here it doesn't happen https://gitlab.com/andreportela/bugfix-mr-squash/merge_requests/1
What is the current bug behavior?
Merge Request won't
merge with the squash option on.
What is the expected correct behavior?
Merge Request should
merge with the squash option on.
Output of checks
This bug happens on GitLab.com