releasing 1.6.0

alistairholt · Mar 11, 2011 · efa3ff1 · efa3ff1
1 parent 9bee4a8
commit efa3ff1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,24 @@
+1.6.0 (March 11, 2011)
+
+* Added MetaWhere support - see issue #194 and #261
+
+* Allow Active Record scopes in Ability conditions - see issue #257
+
+* Added :if and :unless options to check_authorization - see issue #284
+
+* Several Inherited Resources fixes (thanks aq1018, tanordheim and stefanoverna)
+
+* Pass action name to accessible_by call when loading a collection (thanks amw)
+
+* Added :prepend option to load_and_authorize_resource to load before other filters - see issue #290
+
+* Fixed spacing issue in I18n message for multi-word model names - see issue #292
+
+* Load resource collection for any action which doesn't have an "id" parameter - see issue #296
+
+* Raise an exception when trying to make a Ability condition with both a hash of conditions and a block - see issue #269
+
+
 1.5.1 (January 20, 2011)
 
 * Fixing deeply nested conditions in Active Record adapter - see issue #246

diff --git a/README.rdoc b/README.rdoc
@@ -90,7 +90,7 @@ This will raise an exception if authorization is not performed in an action. If
 
 == Wiki Docs
 
-* {Upgrading to 1.5}[https://github.com/ryanb/cancan/wiki/Upgrading-to-1.5]
+* {Upgrading to 1.6}[https://github.com/ryanb/cancan/wiki/Upgrading-to-1.6]
 * {Defining Abilities}[https://github.com/ryanb/cancan/wiki/Defining-Abilities]
 * {Checking Abilities}[https://github.com/ryanb/cancan/wiki/Checking-Abilities]
 * {Authorizing Controller Actions}[https://github.com/ryanb/cancan/wiki/Authorizing-Controller-Actions]

diff --git a/cancan.gemspec b/cancan.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cancan"
-  s.version     = "1.5.1"
+  s.version     = "1.6.0"
   s.author      = "Ryan Bates"
   s.email       = "ryan@railscasts.com"
   s.homepage    = "http://github.com/ryanb/cancan"