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: yuszuv/cancan
base: 9eebeb2155
...
head fork: yuszuv/cancan
compare: 3f4ee12025
Checking mergeability… Don't worry, you can still create the pull request.
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 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 ryanb Merge pull request #607 from Mixbook/master
Added support for value to be Enumerable
6e8bc85
@ryanb ryanb Merge pull request #587 from route/patch-1
Just add singleton to description of authorize_resource
78e1a17
@ryanb ryanb Merge pull request #559 from plentz/patch-1
Adding travis-ci badge
d117624
@ryanb ryanb Merge pull request #564 from flop/master
False positives on multiple nested abilities definitions
b73bd06
@ryanb ryanb Merge pull request #556 from mauriciozaffari/master
Pass forward :if and :unless options to the before filter.
70515de
@ryanb ryanb Merge pull request #505 from nertzy/update_with_model
Use latest with_model gem
c1f7181
@ryanb ryanb Merge pull request #541 from icrowley/master
Fixed bug with params for actions that build new instances with namespaced models
a8a85f1
@ryanb 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 ryanb Merge pull request #492 from soopa/master
Fix "uninitialized constant CanCan::Rule::ModelAdapters"
7f4f469
@ryanb 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 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 ryanb Merge pull request #625 from rogercampos/merging
Adding Ability#merge
b3f9ffe
Commits on May 29, 2012
@ryanb 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 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
@DavidMikeSimon DavidMikeSimon Fix for issue 560 where joins could be thrown away by ActiveRecordAda…
…pter::merge_joins
cfc355c
@ryanb ryanb Merge pull request #618 from spatil/master
Check for defined ActionController::Base instead ActionController
33e33c5
@ryanb ryanb Merge pull request #650 from andhapp/fix-pull-request-486
Fixes Nested Resource Loading
aff8ca6
@ryanb ryanb Merge pull request #653 from andhapp/fix-pull-request-640
Init attributes in InheritedResources controller w/ specs
2b89dbb
@ryanb ryanb load ostruct for OpenStruct used in spec 9448041
@ryanb ryanb clearing leftover whitespace 112a995
@ryanb ryanb removing project status section from readme since contributors are no…
…w kind enough to keep tabs on the issue tracker
a020016
@ryanb ryanb updating changelog 6d7bce7
@ryanb ryanb preparing for 1.6.8 5f1be25
@DavidMikeSimon DavidMikeSimon Spec to test against nested joins being thrown away ala issue 560 b162871
Commits on Jun 23, 2012
@fl00r fl00r Fixing Segmentation fault on aliasing 925274d
Commits on Jun 25, 2012
@ryanb ryanb releasing 1.6.8 1e89b31
Commits on Jun 29, 2012
@andhapp andhapp Add code for fixing issue #664 (regression in 1.6.8). 60bc9e9
Commits on Jul 02, 2012
@brynary brynary Add Code Climate badge 8b993ee
@ryanb ryanb Merge pull request #655 from DavidMikeSimon/master
Fix for issue #560
d20d90d
@ryanb ryanb Merge pull request #660 from fl00r/master
Segmentation fault on aliasing
cad4db2
@ryanb ryanb Merge pull request #670 from andhapp/fix-issue-664
Namespaced Controllers not building new resource from params(regression 1.6.8)
2db73e6
Commits on Jul 03, 2012
@ryanb ryanb Merge pull request #676 from brynary/master
Add Code Climate badge
b4285ae
Commits on Aug 01, 2012
@calebthompson calebthompson Refold generated Ability comments at 80 characters
A lot of people still fold their code at 80 characters, so it is
nice to have generated code consider this.
857dd07
Commits on Oct 13, 2012
@nashby nashby show build status fro master branch 9a84277
@nashby nashby add contributing guide
[ci skip]
d4be93b
Commits on Oct 15, 2012
@nashby nashby Merge pull request #708 from calebthompson/patch-1
Refold generated Ability comments at 80 characters
3b50fed
Commits on Oct 24, 2012
@jonsgreen jonsgreen Issue #687: cancan inserting "AND (NULL)" at the end of sql
Ensure that empty conditions does not trigger unmergeable conditions
f5b3fcd
Commits on Oct 25, 2012
@ryanb ryanb Merge pull request #765 from jonsgreen/issue/cancan_inserting_and_nul…
…l_687

Issue #687: cancan inserting "AND (NULL)" at the end of sql
4dcd544
Commits on Dec 12, 2012
@ryanb ryanb add gem version badge (thanks Gemfury) 3f4ee12
Something went wrong with that request. Please try again.