diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index d581528..c3ec7ac 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,3 +1,10 @@ +1.6.3 (March 25, 2011) + +* Make sure ActiveRecord::Relation is defined before checking conditions against it so Rails 2 is supported again - see issue #312 + +* Return subject passed to authorize! - see issue #314 + + 1.6.2 (March 18, 2011) * Fixed instance loading when :singleton option is used - see issue #310 diff --git a/cancan.gemspec b/cancan.gemspec index 4c1c670..1f732ab 100644 --- a/cancan.gemspec +++ b/cancan.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "cancan" - s.version = "1.6.2" + s.version = "1.6.3" s.author = "Ryan Bates" s.email = "ryan@railscasts.com" s.homepage = "http://github.com/ryanb/cancan"