Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb
index 9da6732796a..560f6ac3130 100644
--- a/lib/gitlab/request_context.rb
+++ b/lib/gitlab/request_context.rb
@@ -24,6 +24,7 @@ module Gitlab
     end
 
     def ensure_deadline_not_exceeded!
+      return unless enabled?
       return unless request_deadline
       return if Gitlab::Metrics::System.real_time < request_deadline
 
@@ -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