summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-03-20 11:46:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-03-20 11:46:38 +0200
commit008877f682c565c6d7945b2c5ae575020ea9038b (patch)
treeb73620722803af8a0e7eb9ad1d463e9358205f55
parent6af99db01ba00b242e6aa3f3a262f5c98249035d (diff)
downloadgitlab-ce-dz-bump-httparty-extended.tar.gz
Replace response.to_s with response.body.to_sdz-bump-httparty-extended
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/services/web_hook_service.rb2
-rw-r--r--lib/gitlab/ci/config/external/file/remote.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/web_hook_service.rb b/app/services/web_hook_service.rb
index 1fee8bfcd31..2b9da795350 100644
--- a/app/services/web_hook_service.rb
+++ b/app/services/web_hook_service.rb
@@ -41,7 +41,7 @@ class WebHookService
{
status: :success,
http_status: response.code,
- message: response.to_s
+ message: response.body.to_s
}
rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout, Gitlab::HTTP::BlockedUrlError, Gitlab::HTTP::RedirectionTooDeep => e
log_execution(
diff --git a/lib/gitlab/ci/config/external/file/remote.rb b/lib/gitlab/ci/config/external/file/remote.rb
index 567a86c47e5..cc8a86db4d3 100644
--- a/lib/gitlab/ci/config/external/file/remote.rb
+++ b/lib/gitlab/ci/config/external/file/remote.rb
@@ -45,7 +45,7 @@ module Gitlab
errors.push("Remote file `#{location}` could not be fetched because of HTTP code `#{response.code}` error!")
end
- response.to_s if errors.none?
+ response&.body.to_s if errors.none?
end
end
end