Merge branch 'release/v2.6.9' into develop

ctran · May 22, 2015 · 7201329 · 7201329
2 parents 8aa0be7 + 75a1836
commit 7201329
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,9 @@
+== 2.6.9
+* Support foreigh key (#241)
+* Check if model has skip tag in annotate_model_file (#167)
+* Fix issue where serializer-related flags weren't being honored (#246)
+* Prefer SQL column type over normalized AR type (#231)
+
 == 2.6.8
 * Nothing annotated unless options[:model_dir] is specified, #234
 

diff --git a/lib/annotate/version.rb b/lib/annotate/version.rb
@@ -1,5 +1,5 @@
 module Annotate
   def self.version
-    '2.6.8'
+    '2.6.9'
   end
 end