Commit 9ca39513 authored by Stan Hu's avatar Stan Hu

Merge branch 'dz-bump-httparty' into 'master'

Bump httparty to version 1.16.4

Closes #44342

See merge request gitlab-org/gitlab-ce!25893
parents a99fcc0c 6af99db0
...@@ -170,7 +170,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' ...@@ -170,7 +170,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
gem 'fugit', '~> 1.1' gem 'fugit', '~> 1.1'
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.13.3' gem 'httparty', '~> 0.16.4'
# Colored output to console # Colored output to console
gem 'rainbow', '~> 3.0' gem 'rainbow', '~> 3.0'
......
...@@ -379,8 +379,8 @@ GEM ...@@ -379,8 +379,8 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
http-form_data (2.1.1) http-form_data (2.1.1)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httparty (0.13.7) httparty (0.16.4)
json (~> 1.8) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.2.0) i18n (1.2.0)
...@@ -1040,7 +1040,7 @@ DEPENDENCIES ...@@ -1040,7 +1040,7 @@ DEPENDENCIES
health_check (~> 2.6.0) health_check (~> 2.6.0)
html-pipeline (~> 2.8) html-pipeline (~> 2.8)
html2text html2text
httparty (~> 0.13.3) httparty (~> 0.16.4)
icalendar icalendar
influxdb (~> 0.2) influxdb (~> 0.2)
jaeger-client (~> 0.10.0) jaeger-client (~> 0.10.0)
......
...@@ -57,7 +57,7 @@ module Sentry ...@@ -57,7 +57,7 @@ module Sentry
raise Client::Error, "Sentry response status code: #{response.code}" raise Client::Error, "Sentry response status code: #{response.code}"
end end
response.as_json response
end end
def projects_api_url def projects_api_url
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment