From 4b67b1cc3a1503fcec6d0e749f40b92c7e50f98e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Thu, 10 Dec 2015 18:28:49 +0100
Subject: [PATCH] bump webmock

---
 Gemfile      |  2 +-
 Gemfile.lock | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3a38671f0..86efeff89 100644
--- a/Gemfile
+++ b/Gemfile
@@ -267,7 +267,7 @@ group :test do
 
   gem "factory_girl_rails", "4.5.0"
   gem "timecop",            "0.8.0"
-  gem "webmock",            "1.22.1", require: false
+  gem "webmock",            "1.22.3", require: false
   gem "shoulda-matchers",   "3.0.1"
 
   gem "diaspora_federation-test", "0.0.10"
diff --git a/Gemfile.lock b/Gemfile.lock
index e565b29fb..95c9d9b20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -87,13 +87,13 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    childprocess (0.5.6)
+    childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.4)
+    chunky_png (1.3.5)
     coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -114,9 +114,10 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 2.13)
+    concurrent-ruby (1.0.0)
     configurate (0.3.1)
     connection_pool (2.2.0)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     cucumber (1.3.20)
       builder (>= 2.1.2)
@@ -366,7 +367,7 @@ GEM
       multi_json (~> 1.0)
       sprockets (>= 2.0.0, < 4.0)
       tilt (~> 1.2)
-    hashdiff (0.2.2)
+    hashdiff (0.2.3)
     hashie (3.4.3)
     hike (1.2.3)
     hiredis (0.5.2)
@@ -396,7 +397,7 @@ GEM
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.3.4)
+    jasmine-core (2.4.1)
     jasmine-jquery-rails (2.0.3)
     jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
@@ -421,7 +422,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    listen (3.0.3)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     little-plugger (1.1.4)
@@ -457,7 +458,7 @@ GEM
     naught (1.1.0)
     nenv (0.2.0)
     nested_form (0.3.2)
-    nio4r (1.1.1)
+    nio4r (1.2.0)
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
     notiffany (0.0.8)
@@ -493,7 +494,7 @@ GEM
       faraday (~> 0.9.0)
       nokogiri (~> 1.6)
     orm_adapter (0.5.0)
-    parser (2.2.2.6)
+    parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     phantomjs (1.9.8.0)
     powerpack (0.1.1)
@@ -548,7 +549,7 @@ GEM
     rails-assets-highlightjs (9.0.0)
     rails-assets-jakobmattsson--jquery-elastic (1.6.11)
       rails-assets-jquery (>= 1.2.6)
-    rails-assets-jasmine (2.3.4)
+    rails-assets-jasmine (2.4.1)
     rails-assets-jasmine-ajax (3.2.0)
       rails-assets-jasmine (~> 2)
     rails-assets-jeresig--jquery.hotkeys (0.2.0)
@@ -616,11 +617,11 @@ GEM
       nokogiri (>= 1.4.1)
       trollop
     redcarpet (3.3.3)
-    redis (3.2.1)
+    redis (3.2.2)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     remotipart (1.2.1)
-    request_store (1.2.0)
+    request_store (1.2.1)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     roxml (3.1.6)
@@ -759,7 +760,7 @@ GEM
     valid (1.1.0)
     warden (1.2.4)
       rack (>= 1.0)
-    webmock (1.22.1)
+    webmock (1.22.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -898,7 +899,7 @@ DEPENDENCIES
   uglifier (= 2.7.2)
   unicorn (= 5.0.1)
   uuid (= 2.3.8)
-  webmock (= 1.22.1)
+  webmock (= 1.22.3)
   will_paginate (= 3.0.7)
 
 BUNDLED WITH