03b12ee550
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: 1. User create a new branch `foo`. 2. User creates a merge request for `foo`. 3. User merges `foo` into `master` by hand. 4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff. 5. `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 See merge request !1758 |
||
|---|---|---|
| .. | ||
| ci | ||
| issues | ||
| merge_requests | ||
| milestones | ||
| notes | ||
| projects | ||
| archive_repository_service_spec.rb | ||
| create_snippet_service_spec.rb | ||
| destroy_group_service_spec.rb | ||
| event_create_service_spec.rb | ||
| git_push_service_spec.rb | ||
| git_tag_push_service_spec.rb | ||
| notification_service_spec.rb | ||
| search_service_spec.rb | ||
| system_hooks_service_spec.rb | ||
| system_note_service_spec.rb | ||
| test_hook_service_spec.rb | ||
| update_snippet_service_spec.rb | ||