aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 7db726fcf..f788aa8d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@ group :develop do
end
group :test, :development do
- gem 'factory_girl_rails'
+ gem 'factory_girl_rails', '~> 1.7'
gem 'rspec-rails'
gem 'spork-rails'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index d0a03a540..e008f01e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,10 +85,10 @@ GEM
eventmachine (1.0.3)
exception_notification (3.0.1)
actionmailer (>= 3.0.4)
- factory_girl (4.2.0)
- activesupport (>= 3.0.0)
- factory_girl_rails (4.2.1)
- factory_girl (~> 4.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)
fakeweb (1.3.0)
fast_gettext (0.7.0)
@@ -257,7 +257,7 @@ DEPENDENCIES
debugger
dynamic_form
exception_notification
- factory_girl_rails
+ factory_girl_rails (~> 1.7)
fakeweb
fast_gettext
fastercsv (>= 1.5.5)