diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-12-27 12:10:20 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-12-27 12:10:20 +0000 |
| commit | 07f0486cf8d5952afb76d153888e600f1f26ad87 (patch) | |
| tree | 373aaa0180a91a1ba26378726ca72fe6aa75bf14 /changelogs | |
| parent | 2a830f87cfae686aa88f995b179f155d1e3537b5 (diff) | |
| parent | 1e5e56c698740e049a3fcf7b578ac006d5deef42 (diff) | |
| download | gitlab-ce-07f0486cf8d5952afb76d153888e600f1f26ad87.tar.gz | |
Merge branch '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file' into 'master'
Resolve "Gitlab merge request view crash when commiting a js sourcemap file"
Closes #25931
See merge request !8310
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file.yml b/changelogs/unreleased/25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file.yml new file mode 100644 index 00000000000..023ec1abcfa --- /dev/null +++ b/changelogs/unreleased/25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file.yml @@ -0,0 +1,4 @@ +--- +title: Fix timeout when MR contains large files marked as binary by .gitattributes +merge_request: +author: |