diff --git a/Changelog b/Changelog index 027746ecc..e7cc81d0e 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +2.4.2 (January 18, 2012) + Fix inline traits' interaction with defaults on the factory + 2.4.1 (January 17, 2012) Deprecate build_stubbed and attributes_for Fix inline traits diff --git a/Gemfile.lock b/Gemfile.lock index 86ad03334..0272ac951 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - factory_girl (2.4.1) + factory_girl (2.4.2) activesupport GEM diff --git a/gemfiles/2.1.gemfile.lock b/gemfiles/2.1.gemfile.lock index 6a4e56611..2e284f715 100644 --- a/gemfiles/2.1.gemfile.lock +++ b/gemfiles/2.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: /Users/joshuaclayton/dev/gems/factory_girl specs: - factory_girl (2.4.1) + factory_girl (2.4.2) activesupport GEM diff --git a/gemfiles/2.3.gemfile.lock b/gemfiles/2.3.gemfile.lock index 7891f2648..219c79bfd 100644 --- a/gemfiles/2.3.gemfile.lock +++ b/gemfiles/2.3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: /Users/joshuaclayton/dev/gems/factory_girl specs: - factory_girl (2.4.1) + factory_girl (2.4.2) activesupport GEM diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index 702dadf07..ba11a1a87 100644 --- a/gemfiles/3.0.gemfile.lock +++ b/gemfiles/3.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: /Users/joshuaclayton/dev/gems/factory_girl specs: - factory_girl (2.4.1) + factory_girl (2.4.2) activesupport GEM diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock index 0ca0a4d02..0811257d4 100644 --- a/gemfiles/3.1.gemfile.lock +++ b/gemfiles/3.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: /Users/joshuaclayton/dev/gems/factory_girl specs: - factory_girl (2.4.1) + factory_girl (2.4.2) activesupport GEM diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock index bc1759c6d..ab48d65cb 100644 --- a/gemfiles/3.2.gemfile.lock +++ b/gemfiles/3.2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: /Users/joshuaclayton/dev/gems/factory_girl specs: - factory_girl (2.4.1) + factory_girl (2.4.2) activesupport GEM diff --git a/lib/factory_girl/version.rb b/lib/factory_girl/version.rb index e15182003..bc484497e 100644 --- a/lib/factory_girl/version.rb +++ b/lib/factory_girl/version.rb @@ -1,4 +1,4 @@ module FactoryGirl - VERSION = "2.4.1" + VERSION = "2.4.2" end