app/models/merge_request.rb · ae8511df1312d85745baddec0b54401b36d46126 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' · e4261fe3
Douwe Maan authored May 12, 2017
```
Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298
```
e4261fe3

merge_request.rb 24.3 KB