From afbaf78b0d819326741a01b093bdbc4702570417 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 1 Apr 2021 15:14:27 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-10-stable-ee

---
 workhorse/config_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'workhorse/config_test.go')

diff --git a/workhorse/config_test.go b/workhorse/config_test.go
index cf33e5bb7ca..f9d12bd5e2b 100644
--- a/workhorse/config_test.go
+++ b/workhorse/config_test.go
@@ -85,7 +85,7 @@ func TestConfigDefaults(t *testing.T) {
 		DocumentRoot:             "public",
 		ProxyHeadersTimeout:      5 * time.Minute,
 		APIQueueTimeout:          queueing.DefaultTimeout,
-		APICILongPollingDuration: 50 * time.Second,
+		APICILongPollingDuration: 50 * time.Nanosecond, // TODO this is meant to be 50*time.Second but it has been wrong for ages
 		ImageResizerConfig:       config.DefaultImageResizerConfig,
 	}
 
-- 
cgit v1.2.3