From 6a014273173b500cfd4e28598c3f6d313a30137c Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Wed, 18 May 2011 13:24:14 -0400
Subject: [PATCH] releasing 1.6.5

---
 CHANGELOG.rdoc | 18 ++++++++++++++++++
 cancan.gemspec |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index ec15cb2..367a91e 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,21 @@
+1.6.5 (May 18, 2011)
+
+* pass action and subject through AccessDenied exception when :through isn't found - issue #366
+
+* many Mongoid adapter improvements (thanks rahearn, cardagin) - issues #363, #352, #343
+
+* allow :through option to work with private controller methods - issue #360
+
+* ensure Mongoid::Document is defined before loading Mongoid adapter - issue #359
+
+* many DataMapper adapter improvements (thanks emmanuel) - issue #355
+
+* handle checking nil attributes through associations (thanks thatothermitch) - issue #330
+
+* improve scope merging - issue #328
+
+
+
 1.6.4 (March 29, 2011)
 
 * Fixed mongoid 'or' error - see issue #322
diff --git a/cancan.gemspec b/cancan.gemspec
index 8583c66..492f7d6 100644
--- a/cancan.gemspec
+++ b/cancan.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cancan"
-  s.version     = "1.6.4"
+  s.version     = "1.6.5"
   s.author      = "Ryan Bates"
   s.email       = "ryan@railscasts.com"
   s.homepage    = "http://github.com/ryanb/cancan"