Skip to content
Commits on Aug 26, 2013
  1. @benmoss
Commits on Jul 13, 2013
  1. @inossidabile

    Comment typo fixed

    inossidabile committed Jul 13, 2013
Commits on May 7, 2013
Commits on May 3, 2013
  1. Merge pull request #675 from bukalapak/master

    committed May 3, 2013
    porting #668 to master branch
Commits on Feb 22, 2013
  1. @nashby

    Merge pull request #728 from zephyr-dev/patch-1

    nashby committed Feb 21, 2013
    Add docs for id_param option of load_resource
  2. Merge pull request #705 from albertobajo/mongoid_find_by

    committed Feb 21, 2013
    Fixed load_resource "find_by" in mongoid resources
  3. Merge pull request #806 from yuszuv/support_for_nested_joins

    committed Feb 21, 2013
    added support for nested join conditions
Commits on Feb 20, 2013
  1. Add docs for id_param option of load_resource

    Ben Moss committed Feb 20, 2013
    Added in #425 but lacked documentation
Commits on Jan 20, 2013
  1. @yuszuv
Commits on Jan 3, 2013
  1. @steerio

    Working around CVE-2012-5664

    steerio committed Jan 3, 2013
Commits on Oct 24, 2012
  1. @jonsgreen

    Issue #687: cancan inserting "AND (NULL)" at the end of sql

    jonsgreen committed Oct 24, 2012
    Ensure that empty conditions does not trigger unmergeable conditions
Commits on Jul 30, 2012
  1. @albertobajo

    Fixed load_resource "find_by" in mongoid resources

    albertobajo committed Jul 30, 2012
    Latest versions of Mongoid supports "find_by" query, but syntax
    is slightly different than Active Record.
Commits on Jul 2, 2012
  1. Merge pull request #670 from andhapp/fix-issue-664

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

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

    committed Jul 2, 2012
    Fix for issue #560
  4. @xinuc

    porting #668 to 1.6.x

    xinuc committed Jun 29, 2012
Commits on Jun 29, 2012
  1. @andhapp
Commits on Jun 23, 2012
  1. @fl00r
Commits on Jun 19, 2012
  1. Merge pull request #653 from andhapp/fix-pull-request-640

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

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

    committed Jun 19, 2012
    Check for defined ActionController::Base instead ActionController
  4. @DavidMikeSimon
Commits on Jun 18, 2012
  1. @andhapp

    Fix pull request 640. For some reason github didn't allow a clean mer…

    andhapp committed Jun 19, 2012
    …ge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI.
  2. @mikepack @andhapp
  3. @mikepack @andhapp

    Add specs for resource attributes.

    mikepack committed with andhapp Jun 4, 2012
    Remove inconsistent line breaks.
  4. @mccraigmccraig @andhapp
  5. @marksim @andhapp

    Fixes Nested Resource Loading

    marksim committed with andhapp Oct 5, 2011
Commits on Jun 10, 2012
  1. @andhapp
Commits on May 29, 2012
  1. Merge pull request #632 from andhapp/fix-issue-327

    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

    committed May 28, 2012
    Adding Ability#merge
Commits on May 26, 2012
  1. @andhapp
Commits on May 14, 2012
  1. @cgunther @derekprior
Commits on May 11, 2012
  1. Merge pull request #492 from soopa/master

    committed May 11, 2012
    Fix "uninitialized constant CanCan::Rule::ModelAdapters"
  2. @Gimi

    Merge pull request #535 from manuelmeurer/patch-2

    Gimi committed May 11, 2012
    Fixed a small typo
Commits on May 10, 2012
  1. Merge pull request #541 from icrowley/master

    committed May 10, 2012
    Fixed bug with params for actions that build new instances with namespaced models
Something went wrong with that request. Please try again.