Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Mar 18, 2011
  1. releasing 1.6.2

  2. fixing failing MetaWhere spec

Commits on Mar 16, 2011
  1. releasing 1.6.1

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

    …'t mess up database - closes #304
  3. making accessible_by action default to :index and parent action defau…

    …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. releasing 1.6.0

Commits on Mar 9, 2011
Commits on Mar 8, 2011
  1. Merge branch 'inherited_resources_collection_fix' of https://github.c…

    …om/tanordheim/cancan into tanordheim-inherited_resources_collection_fix
  2. simplifying .rvmrc

  3. @tanordheim

    Use collection instead of end_of_association_chain in the inherited_r…

    tanordheim authored
    …esources integration, as per suggested by aq1018
Commits on Feb 22, 2011
Commits on Feb 17, 2011
  1. @stefanoverna
Commits on Feb 14, 2011
  1. Merge branch 'pass_action_to_accessible_by' of…

    …/cancan into amw-pass_action_to_accessible_by
Commits on Feb 4, 2011
  1. @spohlenz
Commits on Feb 3, 2011
  1. @amw
Commits on Jan 28, 2011
Commits on Jan 20, 2011
  1. releasing 1.5.1

Something went wrong with that request. Please try again.