diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-04 16:37:31 +0000 |
|---|---|---|
| committer | Tiago <tiagonbotelho@hotmail.com> | 2018-01-19 14:47:53 +0000 |
| commit | 873f632099e54031f169da2d1d4c2fbc6c632c5b (patch) | |
| tree | b0320de2d48c3cb679506f7b08483f74a52581d0 /changelogs | |
| parent | 75662f09ab8fb85a1d6b2055d74a68e1d5ac84f3 (diff) | |
| download | gitlab-ce-873f632099e54031f169da2d1d4c2fbc6c632c5b.tar.gz | |
Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass' into 'master'
Resolve "Error 500 trying to view a merge request JSON: undefined method `binary?' for nil:NilClass"
Closes #41468
See merge request gitlab-org/gitlab-ce!16193
(cherry picked from commit 016a2b6e7ec10c668f09713ae63408ed73dd8feb)
528b5eeb Fix error when viewing diffs without blobs
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass.yml b/changelogs/unreleased/41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass.yml new file mode 100644 index 00000000000..f69116382f0 --- /dev/null +++ b/changelogs/unreleased/41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass.yml @@ -0,0 +1,5 @@ +--- +title: Fix viewing merge request diffs where the underlying blobs are unavailable +merge_request: +author: +type: fixed |