Merge branch 'release/v2.6.9' into develop

ctran · ctran · commit 7201329d8f78 · 2015-05-21T17:35:56.000-07:00
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

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 module Annotate
   def self.version
 -    '2.6.8'
 +    '2.6.9'
   end
 end