Permalink
Browse files

releasing 1.6.9

  • Loading branch information...
1 parent 3f4ee12 commit 38d4654523b3cbd02b9a971c418f32531e5b87ef @ryanb committed Feb 4, 2013
Showing with 12 additions and 1 deletion.
  1. +11 −0 CHANGELOG.rdoc
  2. +1 −1 cancan.gemspec
View
11 CHANGELOG.rdoc
@@ -1,3 +1,14 @@
+1.6.9 (February 4, 2013)
+
+* fix inserting AND (NULL) to end of SQL queries (thanks jonsgreen) - issue #687
+
+* fix merge_joins for nested association hashes (thanks DavidMikeSimon) - issues #655, #560
+
+* raise error on recursive alias_action (thanks fl00r) - issue #660
+
+* fix namespace controllers not loading params (thanks andhapp) - issues #670, #664
+
+
1.6.8 (June 25, 2012)
* improved support for namespaced controllers and models
View
2 cancan.gemspec
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "cancan"
- s.version = "1.6.8"
+ s.version = "1.6.9"
s.author = "Ryan Bates"
s.email = "ryan@railscasts.com"
s.homepage = "http://github.com/ryanb/cancan"

0 comments on commit 38d4654

Please sign in to comment.