Fix factory_girl dependency for REE build

rubysherpas · Apr 26, 2012 · 56af0b2 · 56af0b2
1 parent d2b346e
commit 56af0b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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'