diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-14 14:19:51 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-14 14:19:51 +0000 |
| commit | feb95ce3412ae3ab8b2c990b8ddf64d8d8945670 (patch) | |
| tree | ed4443ed79c6facbf18a5f9f4534e6838410f80d | |
| parent | 1b1475cba4357cfb5f42dd05f8eda7b2932f1c2b (diff) | |
| parent | 561528479ce253fc5591ec38b1b57102dada43fe (diff) | |
| download | gitlab-ce-feb95ce3412ae3ab8b2c990b8ddf64d8d8945670.tar.gz | |
Merge branch 'update-httparty' into 'master'
Update httparty 0.13.3 -> 0.15.6
See merge request gitlab-org/gitlab-ce!17737
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', require: false gem 'rufus-scheduler', '~> 3.4' # HTTP requests -gem 'httparty', '~> 0.13.3' +gem 'httparty', '~> 0.15.6' # Colored output to console gem 'rainbow', '~> 2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 86b4e5301d8..68f33270180 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,8 +411,7 @@ GEM domain_name (~> 0.5) http-form_data (1.0.1) http_parser.rb (0.6.0) - httparty (0.13.7) - json (~> 1.8) + httparty (0.15.7) multi_xml (>= 0.5.2) httpclient (2.8.2) i18n (0.9.1) @@ -1086,7 +1085,7 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) html2text - httparty (~> 0.13.3) + httparty (~> 0.15.6) influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) |