diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 09:08:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 09:08:13 +0300 |
| commit | da92a12093920ecd79d9979a29d987157dd0ef78 (patch) | |
| tree | 32117b6be0900e1247932c1a304bb26b3f2f48c1 /lib/gitlab/jira | |
| parent | 4d528bfd734a021b42f9c829831029e5515deb8f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/jira')
| -rw-r--r-- | lib/gitlab/jira/http_client.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/gitlab/jira/http_client.rb b/lib/gitlab/jira/http_client.rb index 02b0c902a70..7abfe8e38e8 100644 --- a/lib/gitlab/jira/http_client.rb +++ b/lib/gitlab/jira/http_client.rb @@ -35,12 +35,6 @@ module Gitlab request_params[:base_uri] = uri.to_s request_params.merge!(auth_params) - if Feature.enabled?(:jira_raise_timeouts, type: :ops) - request_params[:open_timeout] = 2.minutes - request_params[:read_timeout] = 2.minutes - request_params[:write_timeout] = 2.minutes - end - result = Gitlab::HTTP.public_send(http_method, path, **request_params) # rubocop:disable GitlabSecurity/PublicSend @authenticated = result.response.is_a?(Net::HTTPOK) store_cookies(result) if options[:use_cookies] |