Merge branch 'sh-fix-render-rst' into 'master'

Fix RST rendering hanging on large files

Closes #13244

See merge request gitlab-org/gitlab!31287

Gemfile

@@ -138,7 +138,7 @@ gem 'faraday_middleware-aws-signers-v4'
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.12'
 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 'commonmarker', '~> 0.20'
 gem 'RedCloth', '~> 4.3.2'

Gemfile.lock

@@ -392,7 +392,7 @@ GEM
       redis (> 3.0.0, < 5.0.0)
     gitlab-license (1.0.0)
     gitlab-mail_room (0.0.4)
-    gitlab-markup (1.7.0)
+    gitlab-markup (1.7.1)
     gitlab-net-dns (0.9.1)
     gitlab-puma (4.3.3.gitlab.2)
       nio4r (~> 2.0)
@@ -1245,7 +1245,7 @@ DEPENDENCIES
   gitlab-labkit (= 0.12.0)
   gitlab-license (~> 1.0)
   gitlab-mail_room (~> 0.0.4)
-  gitlab-markup (~> 1.7.0)
+  gitlab-markup (~> 1.7.1)
   gitlab-net-dns (~> 0.9.1)
   gitlab-puma (~> 4.3.3.gitlab.2)
   gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)

changelogs/unreleased/sh-fix-render-rst.yml

+---
+title: Fix RST rendering hanging on large files
+merge_request: 31287
+author:
+type: fixed