summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-08-15 23:58:58 +0000
committerStan Hu <stanhu@gmail.com>2016-08-15 23:58:58 +0000
commit5a4ecb9825f34011e9e021af70a3ff0a696ec3f7 (patch)
tree34d9e4b25e9633b70815fa09cd39d0f4b19e5b71
parent7fef2f7b75e284b702f327cc073476724b51d5ac (diff)
parentfb0a2e270f466f819a4c5cbe89067c48f88ca3f2 (diff)
downloadgitlab-ce-5a4ecb9825f34011e9e021af70a3ff0a696ec3f7.tar.gz
Merge branch 'cs-upgrade-httpclient' into 'master'
Upgrade httpclient gem from 2.7.0.1 to 2.8.2. Fixes deprecation warnings from Ruby 2.3. Resolves #20950. Changelog: https://github.com/nahi/httpclient/blob/b51d7a8bb78f71726b08fbda5abfb900d627569f/CHANGELOG.md#changes-in-282 cc: @stanhu See merge request !5816
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ba6048143c..2244c20203b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -338,7 +338,7 @@ GEM
httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2)
- httpclient (2.7.0.1)
+ httpclient (2.8.2)
i18n (0.7.0)
ice_nine (0.11.1)
influxdb (0.2.3)