diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 00:08:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 00:08:48 +0300 |
| commit | b6ec12ceca58b12d974d46d0579742f4d3cdb9d7 (patch) | |
| tree | c440d6195c651bac465cd37bc0d88fbd3ebefccc /lib/gitlab/request_context.rb | |
| parent | 3832718d895bf8268f3e3aac85948e2792769345 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/request_context.rb')
| -rw-r--r-- | lib/gitlab/request_context.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb index 214670cac28..9da6732796a 100644 --- a/lib/gitlab/request_context.rb +++ b/lib/gitlab/request_context.rb @@ -18,7 +18,6 @@ module Gitlab def request_deadline strong_memoize(:request_deadline) do next unless request_start_time - next unless Feature.enabled?(:request_deadline) request_start_time + max_request_duration_seconds end |