diff --git a/Gemfile.lock b/Gemfile.lock index 7a07f8b4c..2330e4e5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - factory_girl (3.4.0) + factory_girl (3.4.1) activesupport (>= 3.0.0) GEM diff --git a/NEWS b/NEWS index 8bd65b987..3508bbf22 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +3.4.1 (June 18, 2012) + Fix traits so they can be nested and referred to from other traits + 3.4.0 (June 11, 2012) Sequences support Enumerators Optionally disable duplicate assignment of attributes in initialize_with diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index 3ceead2ef..96c3a14e4 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 (3.4.0) + factory_girl (3.4.1) activesupport (>= 3.0.0) GEM diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock index e75dfdc4c..60685bca5 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 (3.4.0) + factory_girl (3.4.1) activesupport (>= 3.0.0) GEM diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock index e7f7eb727..e9005b758 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 (3.4.0) + factory_girl (3.4.1) activesupport (>= 3.0.0) GEM diff --git a/lib/factory_girl/version.rb b/lib/factory_girl/version.rb index 66a644f8a..7ad111b84 100644 --- a/lib/factory_girl/version.rb +++ b/lib/factory_girl/version.rb @@ -1,3 +1,3 @@ module FactoryGirl - VERSION = '3.4.0' + VERSION = '3.4.1' end