diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-08 08:48:23 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-10 23:05:09 +0300 |
| commit | d4fab17d7c8c2b233248295755a6277fdee09c9f (patch) | |
| tree | 4ee583bb9ef541d5e6975d9e36b5b22ffec8b763 /CHANGELOG | |
| parent | a5cd9c9a596c4160bbdc7645f57266655488386c (diff) | |
Fix Error 500 when viewing old merge requests with bad diff data
Customers running old versions of GitLab may have MergeRequestDiffs with
the text ["--broken diff"] due to text generated by gitlab_git 1.0.3.
To avoid the Error 500, verify that each element is a type that gitlab_git
will accept before attempting to create a DiffCollection.
Closes #20776
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 24f77442f1a..dfb953fabd9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.13.0 (unreleased) - AbstractReferenceFilter caches project_refs on RequestStore when active - Replaced the check sign to arrow in the show build view. !6501 - Add a /wip slash command to toggle the Work In Progress status of a merge request. !6259 (tbalthazar) + - Fix Error 500 when viewing old merge requests with bad diff data - Speed-up group milestones show page - Don't include archived projects when creating group milestones. !4940 (Jeroen Jacobs) - Add tag shortcut from the Commit page. !6543 |