Permalink
Commits on Jul 2, 2012
  1. Add Code Climate badge

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

    ryanb committed Jun 25, 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…

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

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

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

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

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

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

    mikepack committed with andhapp Jun 5, 2012
    Remove inconsistent line breaks.
  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

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

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

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

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

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

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

    Gimi committed May 11, 2012
    Fixed a small typo
  4. Merge pull request #616 from NickClark/rails_2_3_readme_clarification

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

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

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

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

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

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

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

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

    ryanb committed May 10, 2012
    Added support for value to be Enumerable