summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirate Praveen <praveen@debian.org>2018-03-14 05:28:33 +0100
committerPirate Praveen <praveen@debian.org>2018-03-14 05:28:33 +0100
commit561528479ce253fc5591ec38b1b57102dada43fe (patch)
tree45272cddd15ca5b6e9bc6d0cddc252b874e3ac8b
parent51f91537640d71262c2fa5070dfb7f8178d1decd (diff)
downloadgitlab-ce-561528479ce253fc5591ec38b1b57102dada43fe.tar.gz
Update httparty 0.13.3 -> 0.15.6
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
2 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 2793463fd81..414f8170a48 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.13.3'
+gem 'httparty', '~> 0.15.6'
# Colored output to console
gem 'rainbow', '~> 2.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index b85c7085d07..aec5253826d 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)