Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

While we wait for 1.6.11... #989

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

While we wait for 1.6.11... #989

wants to merge 23 commits into from

Commits on Jan 27, 2014

  1. Fixes nested ability conditions in issue ryanb#859

    @ricec @bryanrite
    ricec authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    2ea73a9 View commit details
    Browse the repository at this point in the history

  2. FIX: Variable collision prevents defining permissions with multiple n… 

    …ested conditions
    @knoopx @bryanrite
    knoopx authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    e87464b View commit details
    Browse the repository at this point in the history

  3. Use scoped to avoid sql query execution

    @bryanrite
    Savater Sebastien authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    c8aec29 View commit details
    Browse the repository at this point in the history

  4. Avoid deprecation warning with AR 4

    @bryanrite
    Savater Sebastien authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    5155f63 View commit details
    Browse the repository at this point in the history

  5. Update to pass specs

    @bryanrite
    Savater Sebastien authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    375c012 View commit details
    Browse the repository at this point in the history

  6. Changing [].flatten to array wrapper method

    @ralbt @bryanrite
    ralbt authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    a1ba470 View commit details
    Browse the repository at this point in the history

  7. Do not execute the scope condition on class permission checks. 

    @conditions.empty? calls ActiveRecord::Relation#empty? when a scoped condition is provided. ActiveRecord::Relation#empty? will query the database while CanCan only needs to check if conditions are set on the rule.
    @matt-glover @bryanrite
    matt-glover authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    d3e4fd7 View commit details
    Browse the repository at this point in the history

  8. id_param now returns nil when the param is nil

    @francocatena @bryanrite
    francocatena authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    ba5294d View commit details
    Browse the repository at this point in the history

  9. treat ActiveRecord::Relation as Array

    @francocatena @bryanrite
    francocatena authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    44c2ca7 View commit details
    Browse the repository at this point in the history

  10. Fix typo

    @francocatena @bryanrite
    francocatena authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    d5a0732 View commit details
    Browse the repository at this point in the history

  11. Remove .rvmrc, use .ruby-version, and move to 1.9.3

    @bryanrite
    bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    bd755e2 View commit details
    Browse the repository at this point in the history

  12. 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 ryanb#724, ryanb#566 and ryanb#613
    @bryanrite
    Jonas Nicklas and Nicklas Ramhöj authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    8976293 View commit details
    Browse the repository at this point in the history

  13. removed rr, bump rspec version to 2.14, expect syntax, ruby 1.9.3/2.0… 

    ….0 compatible
    @ogerman @bryanrite
    ogerman authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    cd04d23 View commit details
    Browse the repository at this point in the history

  14. ruby 1.8 style hash syntax

    @ogerman @bryanrite
    ogerman authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    a30dfb2 View commit details
    Browse the repository at this point in the history

  15. use expect syntax for Mongoid and DataMappper specs

    @ogerman @bryanrite
    ogerman authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    be24a2c View commit details
    Browse the repository at this point in the history

  16. removed should spec wording, same as on the 2nd branch

    @ryanb @bryanrite
    ryanb authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    b5bfda6 View commit details
    Browse the repository at this point in the history

  17. Reduce object allocations

    @bryanrite
    Eric Chapweske authored and bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    04acbdc View commit details
    Browse the repository at this point in the history

  18. Fixes to specs for spec update.

    @bryanrite
    bryanrite committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    3c97fb3 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2014

  1. Support for strong_parameters

    @bryanrite
    bryanrite committed Jan 28, 2014
    Configuration menu
    Copy the full SHA
    23b2ed6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from bryanrite/yet_another_strong_params_support 

    Support for strong_parameters
    @bryanrite
    bryanrite committed Jan 28, 2014
    Configuration menu
    Copy the full SHA
    535e5db View commit details
    Browse the repository at this point in the history

  3. Run against modern rubies.

    @bryanrite
    bryanrite committed Jan 28, 2014
    Configuration menu
    Copy the full SHA
    d76b2b0 View commit details
    Browse the repository at this point in the history

  4. Add back in 1.8.7 support.

    @bryanrite
    bryanrite committed Jan 28, 2014
    Configuration menu
    Copy the full SHA
    8e70203 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2014

  1. add jruby and rubinus to travis

    @bryanrite
    bryanrite committed Jan 29, 2014
    Configuration menu
    Copy the full SHA
    014f513 View commit details
    Browse the repository at this point in the history