From 6886f64ec3f67a28f5d051100faf5b8fb3407386 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 16 Mar 2018 05:01:19 +0000
Subject: Revert "Merge branch 'update-httparty' into 'master'"

This reverts merge request !17737
---
 Gemfile      | 2 +-
 Gemfile.lock | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2324e29a131..139774bdb5d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', require: false
 gem 'rufus-scheduler', '~> 3.4'
 
 # HTTP requests
-gem 'httparty', '~> 0.15.6'
+gem 'httparty', '~> 0.13.3'
 
 # Colored output to console
 gem 'rainbow', '~> 2.2'
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)
-- 
cgit v1.2.1