From 785c46db53076f18a7edcde18a9ca0c606eaf6c1 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Mon, 8 Jul 2013 13:39:24 +0200
Subject: [PATCH] lock to rspec 2.13.x as 2.14.x rspec-mocks breaks one of our
 tests

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

diff --git a/Gemfile b/Gemfile
index 5c85d6db..aab78b02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'metriks',         '0.9.9.5'
 gem 'ar-octopus',      github: 'travis-ci/octopus', require: nil
 
 group :test do
-  gem 'rspec',         '~> 2.11'
+  gem 'rspec',         '~> 2.13.0'
   gem 'factory_girl',  '~> 2.4.0'
   gem 'mocha',         '~> 0.12'
   gem 'database_cleaner', '~> 0.8.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index b29e2bd7..c301a551 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -223,14 +223,14 @@ GEM
     rerun (0.8.1)
       listen (>= 1.0.3)
     rollout (1.1.0)
-    rspec (2.14.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.0)
-    rspec-expectations (2.14.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
+    rspec-mocks (2.13.1)
     sidekiq (2.5.4)
       celluloid (~> 0.12.0)
       connection_pool (~> 0.9.2)
@@ -293,7 +293,7 @@ DEPENDENCIES
   rake (~> 0.9.2)
   rb-fsevent (~> 0.9.1)
   rerun
-  rspec (~> 2.11)
+  rspec (~> 2.13.0)
   sentry-raven!
   sinatra
   sinatra-contrib