Permalink
Commits on May 11, 2012
  1. 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
    fuelxc committed May 11, 2012
  2. Merge pull request #616 from NickClark/rails_2_3_readme_clarification

    Clarify readme for rails 2.3 users
    Gimi committed May 11, 2012
Commits on May 10, 2012
  1. adding a .rbenv-version file

    ryanb committed May 10, 2012
  2. Merge pull request #541 from icrowley/master

    Fixed bug with params for actions that build new instances with namespaced models
    ryanb committed May 10, 2012
  3. Merge pull request #505 from nertzy/update_with_model

    Use latest with_model gem
    ryanb committed May 10, 2012
  4. Merge pull request #556 from mauriciozaffari/master

    Pass forward :if and :unless options to the before filter.
    ryanb committed May 10, 2012
  5. Merge pull request #564 from flop/master

    False positives on multiple nested abilities definitions
    ryanb committed May 10, 2012
  6. Merge pull request #559 from plentz/patch-1

    Adding travis-ci badge
    ryanb committed May 10, 2012
  7. Merge pull request #587 from route/patch-1

    Just add singleton to description of authorize_resource
    ryanb committed May 10, 2012
  8. Merge pull request #607 from Mixbook/master

    Added support for value to be Enumerable
    ryanb committed May 10, 2012
Commits on Apr 23, 2012
Commits on Apr 17, 2012
Commits on Mar 22, 2012
  1. Just add singleton to description of authorize_resource

    Dmitriy Vorotilin committed Mar 22, 2012
Commits on Feb 29, 2012
Commits on Feb 15, 2012
  1. adding travis-ci badge

    plentz committed Feb 15, 2012
Commits on Feb 2, 2012
  1. Pass forward :if and :unless options to the before filter. i.e:

        load_and_authorize_resource :if => condition == true
    mauriciozaffari committed Feb 2, 2012
Commits on Jan 5, 2012
Commits on Jan 3, 2012
Commits on Dec 12, 2011
Commits on Nov 3, 2011
  1. Use latest with_model gem

    Now with_model clears the association class cache
    between specs, which fixes a test pollution
    problem.
    nertzy committed Nov 3, 2011
Commits on Oct 4, 2011
Commits on Sep 29, 2011
  1. releasing version 1.6.6

    ryanb committed Sep 29, 2011
Commits on Sep 28, 2011
  1. removing jruby/rubinius from travis.yml for now until I figure out wh…

    …y they aren't passing
    ryanb committed Sep 28, 2011
  2. Merge pull request #425 from skhisma/master

    Allow custom IDs to be specified when calling load_resource
    ryanb committed Sep 28, 2011
  3. Merge pull request #424 from whilefalse/master

    Support for namespaced models and engines
    ryanb committed Sep 28, 2011
  4. Merge pull request #476 from kirkconnell/with_model-version-fix

    Specs fail when running in a freshly installed environment.
    ryanb committed Sep 28, 2011
Commits on Sep 21, 2011
Commits on Jul 24, 2011
  1. updating Rails gem dev dependency

    ryanb committed Jul 24, 2011
  2. removing 1.9.2 from .travis.yml

    ryanb committed Jul 24, 2011
  3. Merge pull request #427 from bai/master

    Add .travis.yml for building cancan on a lovely Travis CI service
    ryanb committed Jul 24, 2011
Commits on Jul 23, 2011
  1. Merge pull request #421 from amc-projects/master

    Compatibility fix for rspec-instafail and rspec1
    ryanb committed Jul 23, 2011