summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-30 18:31:09 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-30 18:31:09 +0000
commitde7703a988dab8f7445dac954ab652a296a3def3 (patch)
treea4c66128d6c954b607566e2f6172151648fc8ab1 /changelogs
parent69a3af733e9fcd90d7007057ef79f85cdda13918 (diff)
parent382421a9bed1ef0fd1e97f6dcec8a104342ae1d8 (diff)
downloadgitlab-ce-de7703a988dab8f7445dac954ab652a296a3def3.tar.gz
Merge branch '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master'
Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass" Closes #42160 See merge request gitlab-org/gitlab-ce!16795
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml b/changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml
new file mode 100644
index 00000000000..64340ab08cd
--- /dev/null
+++ b/changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml
@@ -0,0 +1,5 @@
+---
+title: Fix 500 error when loading a merge request with an invalid comment
+merge_request: 16795
+author:
+type: fixed