From 887d9c03f739f09bd9db4472ddfc481678eeff95 Mon Sep 17 00:00:00 2001
From: Amy <sabreuse@gmail.com>
Date: Mon, 28 Jan 2013 19:34:55 -0500
Subject: [PATCH] Specify recent version of rspec-rails

---
 Gemfile      |  2 +-
 Gemfile.lock | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index c10189972..d705e47f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem 'diff-lcs'
 group :development, :test do
   gem 'sqlite3'
   gem 'haml-rails'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '~> 2.12.1'
   gem 'webrat'
   gem 'watchr'
   gem 'spork', '~> 0.9.0.rc'
diff --git a/Gemfile.lock b/Gemfile.lock
index 84440d73a..99783cf03 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
     bluecloth (2.2.0)
     builder (3.0.4)
     cape (1.5.0)
-    capistrano (2.13.5)
+    capistrano (2.14.1)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -57,16 +57,16 @@ GEM
       sass (~> 3.1)
     compass-rails (1.0.3)
       compass (>= 0.12.2, < 0.14)
-    daemon_controller (1.1.0)
+    daemon_controller (1.1.1)
     daemons (1.1.9)
-    debugger (1.2.3)
+    debugger (1.2.4)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.5)
+      debugger-ruby_core_source (~> 1.1.7)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.6)
-    devise (2.2.0)
+    debugger-ruby_core_source (1.1.7)
+    devise (2.2.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -76,10 +76,10 @@ GEM
     eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.1.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.2.0)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     fastthread (1.0.7)
     friendly_id (4.0.9)
@@ -95,7 +95,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.6)
@@ -115,7 +115,7 @@ GEM
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.6.2)
+    net-ssh (2.6.3)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.6)
@@ -127,7 +127,7 @@ GEM
       rake (>= 0.8.1)
     pg (0.14.1)
     polyglot (0.3.3)
-    rack (1.4.3)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
@@ -156,7 +156,7 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
-    rspec-rails (2.12.1)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -166,7 +166,7 @@ GEM
     rvm-capistrano (1.2.7)
       capistrano (>= 2.0.0)
     sass (3.2.5)
-    sass-rails (3.2.5)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
@@ -176,14 +176,14 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
+    sqlite3 (1.3.7)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
     thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
@@ -229,7 +229,7 @@ DEPENDENCIES
   pg
   rails (= 3.2.11)
   rake (>= 10.0.0)
-  rspec-rails
+  rspec-rails (~> 2.12.1)
   rvm-capistrano
   sass-rails (~> 3.2.3)
   spork (~> 0.9.0.rc)