summaryrefslogtreecommitdiff
path: root/lib/gitlab_net.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab_net.rb')
-rw-r--r--lib/gitlab_net.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index 4377005..71e113b 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -73,7 +73,7 @@ class GitlabNet
http = Net::HTTP.new(uri.host, uri.port)
end
- http.read_timeout = options[:read_timeout] || READ_TIMEOUT
+ http.read_timeout = options[:read_timeout] || read_timeout
if uri.is_a?(URI::HTTPS)
http.use_ssl = true
@@ -154,4 +154,8 @@ class GitlabNet
def secret_token
@secret_token ||= File.read config.secret_file
end
+
+ def read_timeout
+ config.http_settings['read_timeout'] || READ_TIMEOUT
+ end
end