Merge branch 'update-httparty' into 'master'

Update httparty 0.13.3 -> 0.15.6

See merge request gitlab-org/gitlab-ce!17737

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'

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)