diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-03-16 05:01:19 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-03-16 05:01:19 +0000 |
| commit | 6886f64ec3f67a28f5d051100faf5b8fb3407386 (patch) | |
| tree | b952217813f0c372d540f46c17881c3f51f09092 /Gemfile.lock | |
| parent | 16d92de1e2ef5c187f7826c5a15fbc2121273dde (diff) | |
| download | gitlab-ce-6886f64ec3f67a28f5d051100faf5b8fb3407386.tar.gz | |
Revert "Merge branch 'update-httparty' into 'master'"
This reverts merge request !17737
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fcc6ef8468c..10b683a44ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,7 +411,8 @@ GEM domain_name (~> 0.5) http-form_data (1.0.1) http_parser.rb (0.6.0) - httparty (0.15.7) + httparty (0.13.7) + json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.8.2) i18n (0.9.5) @@ -1081,7 +1082,7 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) html2text - httparty (~> 0.15.6) + httparty (~> 0.13.3) influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) |