diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-04 16:14:58 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-04 16:14:58 +0300 |
| commit | 41c478cb8f680c57015ab8c2ae7bc0f371a03899 (patch) | |
| tree | aaf10872287b1ac43aef3bd9939c552d8587495a /CHANGELOG | |
| parent | 438e0ce848749944a3b006c0e3cf8249ed847df1 (diff) | |
| parent | 787713895851a7260e2c46e2863b1bbb68b3a649 (diff) | |
Merge branch 'fix-mr-for-orphaned-branches' into 'master'
Fix creation of merge requests for orphaned branches with images
When attempting to create a merge request from an orphaned branch (e.g. this happens for the first commit of any repo) that contained images, GitLab would fail with a Error 500. This MR fixes that problem.
Closes #14875
See merge request !3511
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index f8f21ed0dc9..26e81f3c303 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.7.0 (unreleased) - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.) - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.) - Gracefully handle notes on deleted commits in merge requests (Stan Hu) + - Fix creation of merge requests for orphaned branches (Stan Hu) - Fall back to `In-Reply-To` and `References` headers when sub-addressing is not available (David Padilla) - Remove "Congratulations!" tweet button on newly-created project. (Connor Shea) |