From 36a7060367b4e5a04fe35c839167c8fcc9213ff7 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 15 Mar 2018 22:06:11 -0700
Subject: [PATCH] Revert "Merge branch 'update-httparty' into 'master'"
This reverts commit feb95ce3412ae3ab8b2c990b8ddf64d8d8945670, reversing
changes made to 1b1475cba4357cfb5f42dd05f8eda7b2932f1c2b.
---
Gemfile | 2 +-
Gemfile.lock | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 12bb91d7449f..cfaf83a39598 100644
--- a/Gemfile
+++ b/Gemfile
@@ -174,7 +174,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 b3ce60446e24..dbe233497c79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -439,7 +439,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.3)
i18n (0.9.5)
@@ -1118,7 +1119,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)
--
GitLab