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

bryanrite wants to merge 23 commits intoryanb:masterfrom bryanrite:master

+917-736

Commits on Jan 27, 2014

Fixes nested ability conditions in issue ryanb#859

ricec
authored and
bryanrite
committed
FIX: Variable collision prevents defining permissions with multiple nested conditions

knoopx
authored and
bryanrite
committed
Use scoped to avoid sql query execution

Savater Sebastien
authored and
bryanrite
committed
Avoid deprecation warning with AR 4

Savater Sebastien
authored and
bryanrite
committed
Update to pass specs

Savater Sebastien
authored and
bryanrite
committed
Changing [].flatten to array wrapper method

ralbt
authored and
bryanrite
committed
Do not execute the scope condition on class permission checks.

matt-glover
authored and
bryanrite
committed
id_param now returns nil when the param is nil

francocatena
authored and
bryanrite
committed
treat ActiveRecord::Relation as Array

francocatena
authored and
bryanrite
committed
Fix typo

francocatena
authored and
bryanrite
committed
Remove .rvmrc, use .ruby-version, and move to 1.9.3
bryanrite
committed
Allow multiple abilities with associations

Jonas Nicklas and Nicklas Ramhöj
authored and
bryanrite
committed
removed rr, bump rspec version to 2.14, expect syntax, ruby 1.9.3/2.0.0 compatible

ogerman
authored and
bryanrite
committed
ruby 1.8 style hash syntax

ogerman
authored and
bryanrite
committed
use expect syntax for Mongoid and DataMappper specs

ogerman
authored and
bryanrite
committed
removed should spec wording, same as on the 2nd branch

ryanb
authored and
bryanrite
committed
Reduce object allocations

Eric Chapweske
authored and
bryanrite
committed
Fixes to specs for spec update.
bryanrite
committed

Commits on Jan 29, 2014

add jruby and rubinus to travis
bryanrite
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

While we wait for 1.6.11...#989

Commits on Jan 27, 2014

Fixes nested ability conditions in issue ryanb#859

FIX: Variable collision prevents defining permissions with multiple nested conditions

Use scoped to avoid sql query execution

Avoid deprecation warning with AR 4

Update to pass specs

Changing [].flatten to array wrapper method

Do not execute the scope condition on class permission checks.

id_param now returns nil when the param is nil

treat ActiveRecord::Relation as Array

Fix typo

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

Allow multiple abilities with associations

removed rr, bump rspec version to 2.14, expect syntax, ruby 1.9.3/2.0.0 compatible

ruby 1.8 style hash syntax

use expect syntax for Mongoid and DataMappper specs

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

Reduce object allocations

Fixes to specs for spec update.

Commits on Jan 28, 2014

Support for strong_parameters

Merge pull request #1 from bryanrite/yet_another_strong_params_support

Run against modern rubies.

Add back in 1.8.7 support.

Commits on Jan 29, 2014

add jruby and rubinus to travis