diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-06-03 15:56:33 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-06-03 15:56:33 +0300 |
| commit | 6cb750a2bb7e1720413a7c42ec4afebaa3f2f4d2 (patch) | |
| tree | 2f94f96a1fcb0c692f8e94e924a733d4bad9a59b /lib/gitlab/http.rb | |
| parent | 51a66a581f4d0662d04c432aa4b014dd4b634fc9 (diff) | |
| parent | 3dcf3cfde35d1506c7196634080849d002251a41 (diff) | |
Merge dev.gitlab.org master into GitLab.com master
Diffstat (limited to 'lib/gitlab/http.rb')
| -rw-r--r-- | lib/gitlab/http.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/http.rb b/lib/gitlab/http.rb index 313b5df51d4..db2b4dde244 100644 --- a/lib/gitlab/http.rb +++ b/lib/gitlab/http.rb @@ -18,7 +18,7 @@ module Gitlab include HTTParty # rubocop:disable Gitlab/HTTParty - connection_adapter ProxyHTTPConnectionAdapter + connection_adapter HTTPConnectionAdapter def self.perform_request(http_method, path, options, &block) super |