From 7d2e6c636b83c0d1ff0255230f3721b812c2e0fb Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Thu, 2 Mar 2017 03:16:05 +0100
Subject: [PATCH] Bump webmock

closes #7347
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index eb06dae29..7fe63279b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -288,7 +288,7 @@ group :test do
 
   gem "factory_girl_rails", "4.7.0"
   gem "timecop",            "0.8.1"
-  gem "webmock",            "2.1.0", require: false
+  gem "webmock",            "2.3.2", require: false
   gem "shoulda-matchers",   "3.1.1"
 
   gem "diaspora_federation-test", "0.1.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index 65ac472a5..e58a2c187 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -289,7 +289,7 @@ GEM
       multi_json (~> 1.0)
       sprockets (>= 2.0.0)
       tilt (>= 1.2)
-    hashdiff (0.3.0)
+    hashdiff (0.3.2)
     hashie (3.4.4)
     hike (1.2.3)
     hitimes (1.2.4)
@@ -769,7 +769,7 @@ GEM
       activesupport
       httpclient (>= 2.4)
       multi_json
-    webmock (2.1.0)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -920,8 +920,8 @@ DEPENDENCIES
   unicorn-worker-killer (= 0.4.4)
   uuid (= 2.3.8)
   versionist (= 1.5.0)
-  webmock (= 2.1.0)
+  webmock (= 2.3.2)
   will_paginate (= 3.1.5)
 
 BUNDLED WITH
-   1.13.7
+   1.14.5