From e965db534f1206a7e86e351498e36a85e5cab407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 9 Nov 2014 19:35:18 +0100
Subject: [PATCH] bump webmock

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7815ea7b46..e966ec945d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -222,7 +222,7 @@ group :test do
 
   gem 'factory_girl_rails', '4.5.0'
   gem 'timecop',            '0.7.1'
-  gem 'webmock',            '1.19.0', :require => false
+  gem 'webmock',            '1.20.4', :require => false
 end
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c1eb6440b..72f412e76f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -523,7 +523,7 @@ GEM
       macaddr (~> 1.0)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.19.0)
+    webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     websocket (1.2.1)
@@ -633,6 +633,6 @@ DEPENDENCIES
   uglifier (= 2.5.3)
   unicorn (= 4.8.3)
   uuid (= 2.3.7)
-  webmock (= 1.19.0)
+  webmock (= 1.20.4)
   will_paginate (= 3.0.7)
   zip-zip
-- 
GitLab