diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-29 00:08:41 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-29 00:08:41 +0300 |
| commit | 2b1ddb0f807b328aae00b1d9b0fb7f62e8adbe59 (patch) | |
| tree | ebc6a96333ca6447b571f36eff9d34ea5797b0ee /db/migrate | |
| parent | 0e79b5f3967928a576d68d34c0acc1e2aba6c02a (diff) | |
| parent | b7ec476205173b9ca1780843ceb4617fdde0b9d7 (diff) | |
Merge branch 'mr-merge-base' into 'master'
Correctly determine MR diff base when MR has merge conflicts
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779
See merge request !2632
Diffstat (limited to 'db/migrate')
0 files changed, 0 insertions, 0 deletions