Please sign in to comment.
Merge branch 'master' of https://github.com/ryanb/cancan
* 'master' of https://github.com/ryanb/cancan: Clarify readme for rails 2.3 users adding a .rbenv-version file Add check for Enumerable as condition value adding project status message to readme Just add singleton to description of authorize_resource Don't remove key-value from the subject hash we might want to use it again. adding travis-ci badge Pass forward :if and :unless options to the before filter. i.e: Fixed bug with params for actions that build new instances with namespaced models Use latest with_model gem Conflicts: spec/cancan/controller_resource_spec.rb
- Loading branch information...
Showing with 82 additions and 14 deletions.
- +1 −0 .rbenv-version
- +1 −1 Gemfile
- +15 −1 README.rdoc
- +3 −0 lib/cancan/controller_additions.rb
- +6 −3 lib/cancan/controller_resource.rb
- +2 −2 lib/cancan/rule.rb
- +17 −1 spec/cancan/ability_spec.rb
- +4 −4 spec/cancan/controller_additions_spec.rb
- +18 −2 spec/cancan/controller_resource_spec.rb
- +15 −0 spec/spec_helper.rb