diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-20 21:37:42 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-20 21:37:42 +0000 |
| commit | 9ca395134501b57331a7a49d0c6f5ceb0fc3301d (patch) | |
| tree | 017de3483697aca8b689ffc7adf361842c3f6ffc /Gemfile.lock | |
| parent | a99fcc0c29031bbef191383d7d1617828e14c4d9 (diff) | |
| parent | 6af99db01ba00b242e6aa3f3a262f5c98249035d (diff) | |
| download | gitlab-ce-9ca395134501b57331a7a49d0c6f5ceb0fc3301d.tar.gz | |
Merge branch 'dz-bump-httparty' into 'master'
Bump httparty to version 1.16.4
Closes #44342
See merge request gitlab-org/gitlab-ce!25893
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index face24489f1..6943428a7d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -379,8 +379,8 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - httparty (0.13.7) - json (~> 1.8) + httparty (0.16.4) + mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.2.0) @@ -1040,7 +1040,7 @@ DEPENDENCIES health_check (~> 2.6.0) html-pipeline (~> 2.8) html2text - httparty (~> 0.13.3) + httparty (~> 0.16.4) icalendar influxdb (~> 0.2) jaeger-client (~> 0.10.0) |