From 56af0b250f60aa650b47c3297e56ea697fd4a4e1 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Thu, 26 Apr 2012 14:50:25 -0500 Subject: [PATCH] Fix factory_girl dependency for REE build --- Gemfile.lock | 10 +++++----- forem.gemspec | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e7ed849e1..6f6f3e3c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,10 +67,10 @@ GEM warden (~> 1.1.1) diff-lcs (1.1.3) erubis (2.7.0) - factory_girl (3.2.0) - activesupport (>= 3.0.0) - factory_girl_rails (3.2.0) - factory_girl (~> 3.2.0) + factory_girl (2.6.4) + activesupport (>= 2.3.9) + factory_girl_rails (1.7.0) + factory_girl (~> 2.6.0) railties (>= 3.0.0) ffi (1.0.11) forem-redcarpet (1.0.0) @@ -179,7 +179,7 @@ DEPENDENCIES capybara database_cleaner devise - factory_girl_rails (>= 1.2.0) + factory_girl_rails (~> 1.7) forem! forem-theme-base! jquery-rails diff --git a/forem.gemspec b/forem.gemspec index f94d267d3..97f9a5846 100644 --- a/forem.gemspec +++ b/forem.gemspec @@ -14,12 +14,12 @@ Gem::Specification.new do |s| s.add_development_dependency 'capybara' s.add_development_dependency 'rails', '~> 3.1' s.add_development_dependency 'jquery-rails' - s.add_development_dependency 'factory_girl_rails', '~> 2.0.0' + s.add_development_dependency 'factory_girl_rails', '~> 1.7' s.add_development_dependency 'database_cleaner' s.add_development_dependency 'devise' s.add_development_dependency 'kaminari' - s.add_dependency 'rails', '~>3.1' + s.add_dependency 'rails', '~> 3.1' s.add_dependency 'simple_form' s.add_dependency 'cancan' s.add_dependency 'forem-redcarpet', '1.0.0'