From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 19 Sep 2020 01:45:44 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee

---
 lib/gitlab/pages/settings.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/gitlab/pages')

diff --git a/lib/gitlab/pages/settings.rb b/lib/gitlab/pages/settings.rb
index e3dbeee7b13..8650a80a85e 100644
--- a/lib/gitlab/pages/settings.rb
+++ b/lib/gitlab/pages/settings.rb
@@ -6,12 +6,8 @@ module Gitlab
       DiskAccessDenied = Class.new(StandardError)
 
       def path
-        if ::Gitlab::Runtime.web_server? && ENV['GITLAB_PAGES_DENY_DISK_ACCESS'] == '1'
-          begin
-            raise DiskAccessDenied
-          rescue DiskAccessDenied => ex
-            ::Gitlab::ErrorTracking.track_exception(ex)
-          end
+        if ::Gitlab::Runtime.web_server? && !::Gitlab::Runtime.test_suite?
+          raise DiskAccessDenied
         end
 
         super
-- 
cgit v1.2.1