From e3fd3520f2784ed9c88666ec309cf505daee8f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 1 Jun 2014 13:52:13 +0200
Subject: [PATCH] bump webmock

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

diff --git a/Gemfile b/Gemfile
index d2ef0b80f..ca2d3ad21 100644
--- a/Gemfile
+++ b/Gemfile
@@ -201,7 +201,7 @@ group :test do
 
   gem 'factory_girl_rails', '4.4.1'
   gem 'timecop',            '0.7.1'
-  gem 'webmock',            '1.16.1', :require => false
+  gem 'webmock',            '1.18.0', :require => false
 end
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7e0eb4fcc..450ce75c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -455,8 +455,8 @@ GEM
       rack (>= 1.0)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.16.1)
-      addressable (>= 2.2.7)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
     websocket (1.0.7)
     will_paginate (3.0.5)
@@ -550,6 +550,6 @@ DEPENDENCIES
   uglifier (= 2.5.0)
   unicorn (= 4.8.3)
   uuid (= 2.3.7)
-  webmock (= 1.16.1)
+  webmock (= 1.18.0)
   will_paginate (= 3.0.5)
   zip-zip