Bump to 2.4.2

thoughtbot · Jan 18, 2012 · 845578c · 845578c
1 parent 065c6c1
commit 845578c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end