Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ryanb/cancan
base: 1.6.4
...
head fork: ryanb/cancan
compare: 1.6.8
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Apr 01, 2011
@flop flop Failling test for nested resources with a scope for conditions 81f00f9
@flop flop When using an existing scope, it should be merged properly to the cla…
…ss. May fix ryanb/cancan#328 :)
a10243a
@thatothermitch thatothermitch Fixed bug where conditions on an optionally associated object would t…
…hrow exceptions if the associated object was not present at the rule match time.
6aaab9e
@ryanb Merge branch 'optional-associations' of https://github.com/socialcast…
…/cancan into socialcast-optional-associations
b1424df
Commits on Apr 15, 2011
@rahearn rahearn Adds ability to use Scope query with Mongoid
Same limitations apply as with active record
* can not be OR'd with other rules for same ability/controller
2b62041
Commits on Apr 25, 2011
@ryanb Merged pull request #343 from rahearn/mongoid-scope.
Adds ability to use Scope query with Mongoid
18c1007
Commits on Apr 27, 2011
John Feminella Augments Mongoid adapter by handling case where attribute is an array 17c52a7
@ryanb Merged pull request #352 from cardagin/topic/mongoid-adapter-enhancem…
…ents.

Augments Mongoid adapter by handling case where attribute is an array
a6af47d
Commits on Apr 29, 2011
@emmanuel emmanuel Use dkubb's suggestion for evaluating conditions against a Resource. 6d39b0a
@emmanuel emmanuel Fix pending spec for DataMapper adapter. d6851de
@emmanuel emmanuel Return empty set early if no can rules are present.
Thanks dkubb!
16bdb8d
Commits on May 02, 2011
@ryanb Merge pull request #355 from emmanuel/issue/245.
DataMapper adapter improvements
ff13a82
Commits on May 10, 2011
@rahearn rahearn Fixes bug in mongoid_adapter with empty conditions hash
* adds mongoid query that matches every record when
rule.conditions.empty? is true
ad62d60
Commits on May 12, 2011
@rahearn rahearn Processes can rules only if no empty conditions rules are present
1) remove all empty conditions hashes from the rules, they are included
 in the records through `@model_class.all`
2) only process can rules if the new and old rules lists are the same
  length (meaning there were no empty conditions hashes)
3) always process cannot rules
0882450
Commits on May 17, 2011
@ryanb ensure Mongoid::Document is defined before loading Mongoid adapter - …
…closes #359
cb9777b
@ryanb allow :through option to work with private controller methods - closes dde88c9
@ryanb adding current_ability to helper methods - closes #361 4e4c5a9
@ryanb Merge pull request #363 from rahearn/mongoid-conditions-empty
Fixes bug in mongoid_adapter with empty conditions hash
74c9d58
Commits on May 18, 2011
@ryanb pass action and subject through AccessDenied exception when :through …
…isn't found - closes #366
843fe89
@ryanb releasing 1.6.5 6a01427
Commits on May 20, 2011
@ryanb allow :find_by option to be full find method name - closes #335 c031f82
Commits on May 21, 2011
@ryanb delegating ControllerResource find to model adapter, uses 'get' for D…
…ataMapper - closes #373
613ab1c
Commits on Jun 30, 2011
@nhocki nhocki Make CanCan Default Message a translatable text. Default to the one y…
…ou had.
596ad23
@nhocki nhocki Adding tests for i18n translation for default messages 71f60bc
Commits on Jul 01, 2011
@nhocki nhocki Change the i18n default name to :"unauthorized.default" 1c3e617
@ryanb Merge pull request #409 from nhocki/patch-1
Make CanCan Default Message a translatable text.
8f815c4
@psanford psanford Load datamapper class methods via append_extensions.
This relaxes the previous requirement that cancan has to be loaded
before any models are. append_extensions will apply to all
previously loaded models as well as ones loaded after.
ccd7a94
@ryanb Merge pull request #410 from psanford/improve_datamapper_loading
Load datamapper class methods via append_extensions.
600a3e1
Commits on Jul 19, 2011
@schlick schlick Compatibility fix for using cancan with rspec-instafail and rspec1 3b33b36
Commits on Jul 20, 2011
Steven Anderson Added support for engines and namespaced models. 6c497b8
Steven Anderson Added the needed camelize to recent patch for engines and namespaced …
…models
d35419f
@skhisma skhisma :id_param option to load_resource allows specification of the param n…
…ame to find members
7937a28
Commits on Jul 21, 2011
beawesomeinstead The first try to make cancan pass on Travis CI 1ab4e2d
@manuelmeurer manuelmeurer Fixed typos. e561532
beawesomeinstead Run rake instead of rake test d24ef45
beawesomeinstead These lines are defaults, should be fine this way 0fc67e4
Commits on Jul 23, 2011
@ryanb Merge pull request #426 from manuelmeurer/patch-1
Fixed documentation for skip_load_resource and skip_authorize_resource.
e0492f5
@ryanb Merge pull request #421 from amc-projects/master
Compatibility fix for rspec-instafail and rspec1
987dce0
Commits on Jul 24, 2011
@ryanb Merge pull request #427 from bai/master
Add .travis.yml for building cancan on a lovely Travis CI service
0343f8f
@ryanb removing 1.9.2 from .travis.yml 2be3f98
@ryanb updating Rails gem dev dependency 916f97f
Commits on Sep 21, 2011
@kirkconnell kirkconnell use version 1.x of with_model to avoid errors in class comparisons 5ab7dea
Commits on Sep 28, 2011
@ryanb Merge pull request #476 from kirkconnell/with_model-version-fix
Specs fail when running in a freshly installed environment.
0edd310
@ryanb Merge pull request #424 from whilefalse/master
Support for namespaced models and engines
cfb801e
@ryanb Merge pull request #425 from skhisma/master
Allow custom IDs to be specified when calling load_resource
610d7e3
@codeprimate codeprimate Correct "return cant jump across threads" error when using check_auth…
…orization()
b3fc5ad
@ryanb removing jruby/rubinius from travis.yml for now until I figure out wh…
…y they aren't passing
9832639
Commits on Sep 29, 2011
@ryanb releasing version 1.6.6 26b40f2
Commits on Oct 04, 2011
@ryanb quick fix to get nested resources working again - closes #482 67a3038
@ryanb releasing 1.6.7 with nested resource fix 9eebeb2
Commits on Oct 15, 2011
@soopa soopa fix uninitialized constant warning in CanCan::Rule#model_adapter 80ceaf8
Commits on Oct 31, 2011
@rogercampos rogercampos Adding Ability#merge 7797b37
Commits on Nov 03, 2011
@nertzy nertzy Use latest with_model gem
Now with_model clears the association class cache
between specs, which fixes a test pollution
problem.
9831294
Commits on Nov 09, 2011
@moffff moffff Fixed problem with 'with_model' gem in DataMapper tests and Mongoid t…
…ests.
f18f53c
Commits on Dec 25, 2011
@manuelmeurer manuelmeurer Fixed typo e65f9bd
Commits on Jan 05, 2012
@icrowley icrowley Fixed bug with params for actions that build new instances with names…
…paced models
baadcb9
Commits on Feb 02, 2012
@mauriciozaffari mauriciozaffari Pass forward :if and :unless options to the before filter. i.e:
    load_and_authorize_resource :if => condition == true
83e2dce
Commits on Feb 15, 2012
@plentz plentz adding travis-ci badge 37a42e3
Commits on Feb 29, 2012
@flop flop Don't remove key-value from the subject hash we might want to use it …
…again.
ba01349
Commits on Mar 22, 2012
@route route Just add singleton to description of authorize_resource f166b59
Commits on Apr 03, 2012
@spatil spatil checked for ActionContoller::Base instead of just ActionContoller 51702e0
Commits on Apr 17, 2012
@ryanb adding project status message to readme aed37cd
Commits on Apr 23, 2012
@Aryk Aryk Add check for Enumerable as condition value 65bbf0e
Commits on May 10, 2012
@ryanb Merge pull request #607 from Mixbook/master
Added support for value to be Enumerable
6e8bc85
@ryanb Merge pull request #587 from route/patch-1
Just add singleton to description of authorize_resource
78e1a17
@ryanb Merge pull request #559 from plentz/patch-1
Adding travis-ci badge
d117624
@ryanb Merge pull request #564 from flop/master
False positives on multiple nested abilities definitions
b73bd06
@ryanb Merge pull request #556 from mauriciozaffari/master
Pass forward :if and :unless options to the before filter.
70515de
@ryanb Merge pull request #505 from nertzy/update_with_model
Use latest with_model gem
c1f7181
@ryanb Merge pull request #541 from icrowley/master
Fixed bug with params for actions that build new instances with namespaced models
a8a85f1
@ryanb adding a .rbenv-version file 10cbfbb
@NickClark NickClark Clarify readme for rails 2.3 users 0bbe2e1
Commits on May 11, 2012
@Gimi Gimi Merge pull request #616 from NickClark/rails_2_3_readme_clarification
Clarify readme for rails 2.3 users
8e46cca
@Gimi Gimi Merge pull request #535 from manuelmeurer/patch-2
Fixed a small typo
14e1f5c
@ryanb Merge pull request #492 from soopa/master
Fix "uninitialized constant CanCan::Rule::ModelAdapters"
7f4f469
@ryanb Merge pull request #509 from moffff/master
Fix 'spec/spec_helper.rb:20: uninitialized constant WithModel (NameError)'
1cdd7b3
Commits on May 14, 2012
@cgunther cgunther port fix for namespaced params from 2.0 back to 1.6 b347c7b
@ryanb Merge pull request #619 from derekprior/namespace-fix
Updated: port fix for namespaced params from 2.0 back to 1.6
0c21831
Commits on May 26, 2012
@andhapp andhapp Fix to handle MetaWhere and non-MetaWhere conditions correctly. c27ead5
Commits on May 28, 2012
@ryanb Merge pull request #625 from rogercampos/merging
Adding Ability#merge
b3f9ffe
Commits on May 29, 2012
@ryanb Merge pull request #632 from andhapp/fix-issue-327
Fix to handle MetaWhere and non-MetaWhere conditions correctly.
80a8c39
Commits on Jun 10, 2012
@andhapp andhapp Fix for issue-644 to allow users to specify a mix of can and cannot r…
…ules with mongo.
da663aa
Commits on Jun 11, 2012
@ryanb Merge pull request #645 from andhapp/issue-644
Allow users to specify a mix of can and cannot rule for mongoid
7bf683d
Commits on Jun 18, 2012
@marksim marksim Fixes Nested Resource Loading d5baed6
@mccraigmccraig mccraigmccraig initialise attributes after a resource is created by an InheritedReso…
…urces controller
c2c0b86
@mikepack mikepack Add specs for resource attributes.
Remove inconsistent line breaks.
b965f5b
@mikepack mikepack Refactor out attribute assignment 88aba46
@andhapp andhapp 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.
a1254ca
Commits on Jun 19, 2012
@ryanb Merge pull request #618 from spatil/master
Check for defined ActionController::Base instead ActionController
33e33c5
@ryanb Merge pull request #650 from andhapp/fix-pull-request-486
Fixes Nested Resource Loading
aff8ca6
@ryanb Merge pull request #653 from andhapp/fix-pull-request-640
Init attributes in InheritedResources controller w/ specs
2b89dbb
@ryanb load ostruct for OpenStruct used in spec 9448041
@ryanb clearing leftover whitespace 112a995
@ryanb removing project status section from readme since contributors are no…
…w kind enough to keep tabs on the issue tracker
a020016
@ryanb updating changelog 6d7bce7
@ryanb preparing for 1.6.8 5f1be25
Commits on Jun 25, 2012
@ryanb releasing 1.6.8 1e89b31
Something went wrong with that request. Please try again.