Fix bug where manually merged branches in a MR would end up with an empty diff
This bug manifested in 8.1 with the refactoring of RefreshService
. Here's what happens:
- User create a new branch
foo
. - User creates a merge request for
foo
. - User merges
foo
intomaster
by hand. -
RefreshService
reloads the merge request. Sincemaster
is equivalent tofoo
, this results in an empty diff. -
RefreshService
then closes the MR.
This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens.
Closes #3314 (moved)