diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-12 23:37:30 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-19 10:32:41 +0300 |
| commit | fdc7d7039b83c2d9b3578338408ce28c6423a483 (patch) | |
| tree | 97377da21eda499ce8a39389bfb93cebae9292fe /changelogs | |
| parent | f9a347fdcae0c4da4b2a8c3a03a7e2c6863d308d (diff) | |
Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'
Fix conflict resolution from corrupted upstream
Closes gitlab-ee#2128
See merge request !11298
Conflicts:
app/models/merge_request.rb
spec/models/merge_request_spec.rb
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml b/changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml new file mode 100644 index 00000000000..19a3c56e478 --- /dev/null +++ b/changelogs/unreleased/fix-conflict-resolution-with-corrupt-repos.yml @@ -0,0 +1,5 @@ +--- +title: Prevent further repository corruption when resolving conflicts from a fork + where both the fork and upstream projects require housekeeping +merge_request: +author: |