Commit 7ce27b49 authored by Stan Hu's avatar Stan Hu Committed by Alain Takoudjou

Fix RST rendering hanging on large files

To render ReStructuredText files, the gitlab-markup gem spawns a python3
process via `Popen.open3`. If the stdout buffer exceeded the maximum
size, the pipe would be filled, causing a 60-second timeout on the
backend.

This version bump brings in the change in
https://gitlab.com/gitlab-org/gitlab-markup/-/merge_requests/23

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/13244
parent df89aa7e
...@@ -138,7 +138,7 @@ gem 'faraday_middleware-aws-signers-v4' ...@@ -138,7 +138,7 @@ gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '2.3.1' gem 'deckar01-task_list', '2.3.1'
gem 'gitlab-markup', '~> 1.7.0' gem 'gitlab-markup', '~> 1.7.1'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.20' gem 'commonmarker', '~> 0.20'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
......
...@@ -398,7 +398,7 @@ GEM ...@@ -398,7 +398,7 @@ GEM
redis (> 3.0.0, < 5.0.0) redis (> 3.0.0, < 5.0.0)
gitlab-license (1.0.0) gitlab-license (1.0.0)
gitlab-mail_room (0.0.3) gitlab-mail_room (0.0.3)
gitlab-markup (1.7.0) gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1) gitlab-net-dns (0.9.1)
gitlab-puma (4.3.3.gitlab.2) gitlab-puma (4.3.3.gitlab.2)
nio4r (~> 2.0) nio4r (~> 2.0)
...@@ -1247,7 +1247,7 @@ DEPENDENCIES ...@@ -1247,7 +1247,7 @@ DEPENDENCIES
gitlab-labkit (= 0.12.0) gitlab-labkit (= 0.12.0)
gitlab-license (~> 1.0) gitlab-license (~> 1.0)
gitlab-mail_room (~> 0.0.3) gitlab-mail_room (~> 0.0.3)
gitlab-markup (~> 1.7.0) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma (~> 4.3.3.gitlab.2)
gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
......
---
title: Fix RST rendering hanging on large files
merge_request: 31287
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment