QA: Merge Request, Squash Commits not functioning properly

Summary

Recent runs of GitLab QA against the cloud native GitLab charts have been seeing errors with the squash functionality of merge requests. See charts/gitlab#535 .

As this code is now housed in GitLab CE after gitlab-org/gitlab-ce!18956 && gitlab-org/gitlab-ee!5727 , I have chosen to raise the issue here.

Test that is failing: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/specs/features/merge_request/squash_spec.rb

Steps to reproduce

  • Deploy master's nightly build
  • Run GitLab QA's full gamut of test, including the listed one.

What is the current bug behavior?

The to be squashed commit is still present, and in the master branch's history.

What is the expected correct behavior?

The to be squashed commit is removed, and not in the master branch's history.

Relevant logs and/or screenshots

Screenshot_20180619_140236

Possible fixes

This has only arisen within the last week, considering the age of the MRs that moved these features, I would have thought it would have been seen prior.