Bump version to 2.6.0

thoughtbot · Feb 17, 2012 · 2d19c46 · 2d19c46
1 parent de007be
commit 2d19c46
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,9 @@
+2.6.0 (February 17, 2012)
+  Improve documentation of has_many associations in the GETTING_STARTED
+    document
+  Deprecate :method in favor of :strategy when overriding an association's
+    build strategy
+
 2.5.2 (February 10, 2012)
   Fix step definitions to use associations defined in parent factories
   Add inline trait support to (build|create)_list

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.5.2)
+    factory_girl (2.6.0)
       activesupport (>= 2.3.9)
 
 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.5.2)
+    factory_girl (2.6.0)
       activesupport (>= 2.3.9)
 
 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.5.2)
+    factory_girl (2.6.0)
       activesupport (>= 2.3.9)
 
 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.5.2)
+    factory_girl (2.6.0)
       activesupport (>= 2.3.9)
 
 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.5.2)
+    factory_girl (2.6.0)
       activesupport (>= 2.3.9)
 
 GEM

diff --git a/lib/factory_girl/version.rb b/lib/factory_girl/version.rb
@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.5.2"
+  VERSION = "2.6.0"
 end