From f2c755d2fbfd12639bfc25ccb0088db01a0decc9 Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Tue, 3 Jun 2014 15:19:36 +0200
Subject: [PATCH] fix Gemfile (rspec would fail)

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6fe6b621..445d736a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ group :test do
   gem 'database_cleaner'
   gem 'connection_pool'
   # need to include rspec components before i18n-spec or rake fails in test environment
-  gem 'rspec-core'
+  gem 'rspec-core', '= 2.14.8' # version until we're ready for rspec 3.0
   gem 'rspec-expectations'
   gem 'rspec-rerun'
   gem 'i18n-spec'
diff --git a/Gemfile.lock b/Gemfile.lock
index a89bae79..ba503c36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
     capistrano-rvm (0.1.1)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capybara (2.2.1)
+    capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -134,7 +134,7 @@ GEM
       thor
     daemons (1.1.9)
     database_cleaner (1.3.0)
-    date_time_attribute (0.0.6)
+    date_time_attribute (0.1.2)
       activesupport (>= 3.0.0)
     debug_inspector (0.0.2)
     deface (1.0.0)
@@ -173,9 +173,9 @@ GEM
     i18n (0.6.9)
     i18n-spec (0.4.1)
       iso
-    inherited_resources (1.4.1)
+    inherited_resources (1.5.0)
       has_scope (~> 0.6.0.rc)
-      responders (~> 1.0.0.rc)
+      responders (~> 1.0)
     iso (0.2.1)
       i18n
     jquery-rails (3.1.0)
@@ -268,7 +268,7 @@ GEM
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
     ref (1.0.5)
-    responders (1.0.0)
+    responders (1.1.0)
       railties (>= 3.2, < 5)
     resque (1.25.2)
       mono_logger (~> 1.0)
@@ -345,7 +345,7 @@ GEM
     sqlite3 (1.3.9)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    sshkit (1.5.0)
+    sshkit (1.5.1)
       colorize
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
@@ -440,7 +440,7 @@ DEPENDENCIES
   rails-settings-cached (= 0.3.1)
   ransack
   resque
-  rspec-core
+  rspec-core (= 2.14.8)
   rspec-expectations
   rspec-rails
   rspec-rerun