Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb
index 9da6732796a..952ae55d90a 100644
--- a/lib/gitlab/request_context.rb
+++ b/lib/gitlab/request_context.rb
@@ -24,11 +24,12 @@ module Gitlab
     end
 
     def ensure_deadline_not_exceeded!
+      return unless enabled?
       return unless request_deadline
       return if Gitlab::Metrics::System.real_time < request_deadline
 
       raise RequestDeadlineExceeded,
-            "Request takes longer than #{max_request_duration_seconds}"
+            "Request takes longer than #{max_request_duration_seconds} seconds"
     end
 
     private
@@ -36,5 +37,9 @@ module Gitlab
     def max_request_duration_seconds
       Settings.gitlab.max_request_duration_seconds
     end
+
+    def enabled?
+      !Rails.env.test?
+    end
   end
 end