summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-05-04 09:16:24 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-05-04 18:35:53 -0500
commit6eb9e981c61969a904ccbae2c5f52f562b02d199 (patch)
treebff683eaedd5d763c39c1d4dd28307e377d92c8a /lib
parent64e811957795293b647bda7aef23ffbd92082614 (diff)
downloadgitlab-ce-6eb9e981c61969a904ccbae2c5f52f562b02d199.tar.gz
Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fix
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/prometheus.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/prometheus.rb b/lib/gitlab/prometheus.rb
index aa9810c5c41..8827507955d 100644
--- a/lib/gitlab/prometheus.rb
+++ b/lib/gitlab/prometheus.rb
@@ -55,7 +55,7 @@ module Gitlab
rescue OpenSSL::SSL::SSLError
raise PrometheusError, "#{url} contains invalid SSL data"
rescue HTTParty::Error
- raise PrometheusError, "An error has ocurred"
+ raise PrometheusError, "Network connection error"
end
def handle_response(response)