Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Apr 1, 2011
  1. @ryanb

    Merge branch 'optional-associations' of https://github.com/socialcast…

    ryanb authored
    …/cancan into socialcast-optional-associations
  2. @thatothermitch

    Fixed bug where conditions on an optionally associated object would t…

    thatothermitch authored
    …hrow exceptions if the associated object was not present at the rule match time.
  3. @flop
  4. @flop
Commits on Mar 30, 2011
  1. @ryanb

    releasing 1.6.4

    ryanb authored
  2. @ryanb
Commits on Mar 25, 2011
  1. @ryanb

    releasing 1.6.3

    ryanb authored
  2. @ryanb

    make sure ActiveRecord::Relation is defined before checking condition…

    ryanb authored
    …s against it so Rails 2 is supported again - closes #312
  3. @ryanb
Commits on Mar 18, 2011
  1. @ryanb

    releasing 1.6.2

    ryanb authored
  2. @ryanb
  3. @ryanb

    fixing failing MetaWhere spec

    ryanb authored
Commits on Mar 16, 2011
  1. @ryanb

    releasing 1.6.1

    ryanb authored
  2. @ryanb

    use Item.new instead of build_item for singleton resource so it doesn…

    ryanb authored
    …'t mess up database - closes #304
  3. @ryanb

    making accessible_by action default to :index and parent action defau…

    ryanb authored
    …lt to :show so we don't check :read action directly - closes #302
  4. @amw

    Fixes inherited_resources collection authorization

    amw authored
    This reverts e3eab13
    
    I don't know what was the idea of that, but it turned out REAL bad.
    
    `collection` sets the collection instance variable. `resource_base` is used all
    over CanCan. It's also used inside `load_collection?` which is checked before
    `load_collection` is called. That means we actually set the collection instance
    variable through inherited_resources (without any authorization whatsoever) before trying to load it through CanCan using `accessible_by`.
    
        1. def load_resource
        2.  unless skip?(:load)
        3.    if load_instance?
        4.      self.resource_instance ||= load_resource_instance
        5.    elsif load_collection?
        6.      self.collection_instance ||= load_collection
        7.    end
        8.  end
        9. end
    
    `collection_instance` is set on line 5 instead of line 6.
Commits on Mar 11, 2011
  1. @ryanb

    releasing 1.6.0

    ryanb authored
Commits on Mar 9, 2011
  1. @ryanb
  2. @ryanb
  3. @ryanb
  4. @ryanb
  5. @ryanb
  6. @ryanb
  7. @ryanb
Commits on Mar 8, 2011
  1. @ryanb
  2. @ryanb
  3. @ryanb
  4. @ryanb
  5. @ryanb

    Merge branch 'inherited_resources_collection_fix' of https://github.c…

    ryanb authored
    …om/tanordheim/cancan into tanordheim-inherited_resources_collection_fix
  6. @ryanb

    simplifying .rvmrc

    ryanb authored
  7. @ryanb
  8. @ryanb
  9. @ryanb
  10. @ryanb
  11. @tanordheim

    Use collection instead of end_of_association_chain in the inherited_r…

    tanordheim authored
    …esources integration, as per suggested by aq1018
Something went wrong with that request. Please try again.