From b595cb0c1dec83de5bdee18284abe86614bed33b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Jul 2022 15:40:28 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-2-stable-ee --- app/helpers/markup_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/helpers/markup_helper.rb') diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 777d485797f..6077a059f6f 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -8,8 +8,8 @@ module MarkupHelper # Let's increase the render timeout # For a smaller one, a test that renders the blob content statically fails - # We can consider removing this custom timeout when refactor_blob_viewer FF is removed: - # https://gitlab.com/gitlab-org/gitlab/-/issues/324351 + # We can consider removing this custom timeout when markup_rendering_timeout FF is removed: + # https://gitlab.com/gitlab-org/gitlab/-/issues/365358 RENDER_TIMEOUT = 5.seconds def plain?(filename) -- cgit v1.2.1