Permalink
Commits on Nov 5, 2012
  1. Left outer joins returns duplicates.

    We don't want that.
    jnicklas committed Nov 5, 2012
Commits on Nov 2, 2012
Commits on Aug 22, 2012
  1. Allow multiple abilities with associations

    There are two issues with the current way cancan handles associations:
    
    1) Records are returned multiple times in some circumstances
    2) Several defined abilities prevent some records to show up under certain circumstances
    
    This commit includes tests for both cases. It fixes both problems by changing `joins` to `includes` for the AR adapters. This could have performance implications, since `includes` will also select all columns in the associated records. We tried various ways of achieving the same thing using Arel directly, but were unable to make this work due to lack of support for outer joins in Rails 3.1.
    
    This closes issues #724, #566 and #613
    Jonas Nicklas and Nicklas Ramhöj committed Aug 22, 2012
Commits on Jul 3, 2012
  1. Merge pull request #676 from brynary/master

    Add Code Climate badge
    ryanb committed Jul 3, 2012
Commits on Jul 2, 2012
  1. Merge pull request #670 from andhapp/fix-issue-664

    Namespaced Controllers not building new resource from params(regression 1.6.8)
    ryanb committed Jul 2, 2012
  2. Merge pull request #660 from fl00r/master

    Segmentation fault on aliasing
    ryanb committed Jul 2, 2012
  3. Merge pull request #655 from DavidMikeSimon/master

    Fix for issue #560
    ryanb committed Jul 2, 2012
  4. Add Code Climate badge

    brynary committed Jul 2, 2012
Commits on Jun 29, 2012
Commits on Jun 25, 2012
  1. releasing 1.6.8

    ryanb committed Jun 25, 2012
Commits on Jun 23, 2012
Commits on Jun 19, 2012
  1. preparing for 1.6.8

    ryanb committed Jun 19, 2012
  2. updating changelog

    ryanb committed Jun 19, 2012
  3. removing project status section from readme since contributors are no…

    …w kind enough to keep tabs on the issue tracker
    ryanb committed Jun 19, 2012
  4. clearing leftover whitespace

    ryanb committed Jun 19, 2012
  5. Merge pull request #653 from andhapp/fix-pull-request-640

    Init attributes in InheritedResources controller w/ specs
    ryanb committed Jun 19, 2012
  6. Merge pull request #650 from andhapp/fix-pull-request-486

    Fixes Nested Resource Loading
    ryanb committed Jun 19, 2012
  7. Merge pull request #618 from spatil/master

    Check for defined ActionController::Base instead ActionController
    ryanb committed Jun 19, 2012
Commits on Jun 18, 2012
  1. Fix pull request 640. For some reason github didn't allow a clean mer…

    …ge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI.
    andhapp committed Jun 18, 2012
  2. Add specs for resource attributes.

    Remove inconsistent line breaks.
    mikepack committed with andhapp Jun 5, 2012
  3. Fixes Nested Resource Loading

    marksim committed with andhapp Oct 5, 2011
Commits on Jun 11, 2012
  1. Merge pull request #645 from andhapp/issue-644

    Allow users to specify a mix of can and cannot rule for mongoid
    ryanb committed Jun 11, 2012
Commits on Jun 10, 2012
Commits on May 29, 2012
  1. Merge pull request #632 from andhapp/fix-issue-327

    Fix to handle MetaWhere and non-MetaWhere conditions correctly.
    ryanb committed May 29, 2012
Commits on May 28, 2012
  1. Merge pull request #625 from rogercampos/merging

    Adding Ability#merge
    ryanb committed May 28, 2012
Commits on May 26, 2012
Commits on May 14, 2012
  1. Merge pull request #619 from derekprior/namespace-fix

    Updated: port fix for namespaced params from 2.0 back to 1.6
    ryanb committed May 14, 2012
Commits on May 11, 2012
  1. Merge pull request #509 from moffff/master

    Fix 'spec/spec_helper.rb:20: uninitialized constant WithModel (NameError)'
    ryanb committed May 11, 2012
  2. Merge pull request #492 from soopa/master

    Fix "uninitialized constant CanCan::Rule::ModelAdapters"
    ryanb committed May 11, 2012