Permalink
Commits on Jun 25, 2012
  1. releasing 1.6.8

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

    committed Jun 19, 2012
  2. updating changelog

    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
    committed Jun 19, 2012
  4. clearing leftover whitespace

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

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

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

    Check for defined ActionController::Base instead ActionController
    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
    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.
    committed May 29, 2012
Commits on May 28, 2012
  1. Merge pull request #625 from rogercampos/merging

    Adding Ability#merge
    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
    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)'
    committed May 11, 2012
  2. Merge pull request #492 from soopa/master

    Fix "uninitialized constant CanCan::Rule::ModelAdapters"
    committed May 11, 2012
  3. Merge pull request #535 from manuelmeurer/patch-2

    Fixed a small typo
    Gimi committed May 11, 2012
  4. 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

    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
    committed May 10, 2012
  3. Merge pull request #505 from nertzy/update_with_model

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

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

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

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

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

    Added support for value to be Enumerable
    committed May 10, 2012
Commits on Apr 23, 2012