will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
374 Commits 2 Branches 29 Tags
a0200166cc9523c7f60361f8ac19d32455d0aacd
Commit Graph

374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Bates a0200166cc removing project status section from readme since contributors are now kind enough to keep tabs on the issue tracker 2012-06-19 11:37:45 -07:00
Ryan Bates 112a995327 clearing leftover whitespace 2012-06-19 11:36:59 -07:00
Ryan Bates 944804183e load ostruct for OpenStruct used in spec 2012-06-19 11:35:58 -07:00
Ryan Bates 2b89dbbdfa Merge pull request #653 from andhapp/fix-pull-request-640 
Init attributes in InheritedResources controller w/ specs
 2012-06-19 10:53:22 -07:00
Ryan Bates aff8ca60e4 Merge pull request #650 from andhapp/fix-pull-request-486 
Fixes Nested Resource Loading
 2012-06-19 10:50:29 -07:00
Ryan Bates 33e33c584e Merge pull request #618 from spatil/master 
Check for defined ActionController::Base instead ActionController
 2012-06-19 10:41:14 -07:00
Anuj Dutta a1254ca1c6 Fix pull request 640. For some reason github didn't allow a clean merge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI. 2012-06-19 00:13:19 +01:00
Mike Pack 88aba4664a Refactor out attribute assignment 2012-06-19 00:08:27 +01:00
Mike Pack b965f5bab4 Add specs for resource attributes. 
Remove inconsistent line breaks.
 2012-06-19 00:08:27 +01:00
mccraig mccraig of the clan mccraig c2c0b86c3a initialise attributes after a resource is created by an InheritedResources controller 2012-06-19 00:08:26 +01:00
Mark Sim d5baed6281 Fixes Nested Resource Loading 2012-06-18 06:52:32 +01:00
Ryan Bates 7bf683d8f4 Merge pull request #645 from andhapp/issue-644 
Allow users to specify a mix of can and cannot rule for mongoid
 2012-06-11 09:52:38 -07:00
Anuj Dutta da663aaed1 Fix for issue-644 to allow users to specify a mix of can and cannot rules with mongo. 2012-06-10 22:54:45 +01:00
Ryan Bates 80a8c39a93 Merge pull request #632 from andhapp/fix-issue-327 
Fix to handle MetaWhere and non-MetaWhere conditions correctly.
 2012-05-29 10:04:18 -07:00
Ryan Bates b3f9ffe93b Merge pull request #625 from rogercampos/merging 
Adding Ability#merge
 2012-05-28 11:02:51 -07:00
Anuj Dutta c27ead5b9f Fix to handle MetaWhere and non-MetaWhere conditions correctly. 2012-05-26 18:00:50 +01:00
Ryan Bates 0c21831b4d Merge pull request #619 from derekprior/namespace-fix 
Updated: port fix for namespaced params from 2.0 back to 1.6
 2012-05-14 09:24:25 -07:00
Chris Gunther b347c7b78c port fix for namespaced params from 2.0 back to 1.6 2012-05-14 10:52:29 -04:00
Ryan Bates 1cdd7b3c18 Merge pull request #509 from moffff/master 
Fix 'spec/spec_helper.rb:20: uninitialized constant WithModel (NameError)'
 2012-05-11 08:59:41 -07:00
Ryan Bates 7f4f469e58 Merge pull request #492 from soopa/master 
Fix "uninitialized constant CanCan::Rule::ModelAdapters"
 2012-05-11 08:51:50 -07:00
Gimi Liang 14e1f5cad4 Merge pull request #535 from manuelmeurer/patch-2 
Fixed a small typo
 2012-05-11 08:17:55 -07:00
Gimi Liang 8e46ccad8c Merge pull request #616 from NickClark/rails_2_3_readme_clarification 
Clarify readme for rails 2.3 users
 2012-05-11 08:12:22 -07:00
Nicholas Clark 0bbe2e1802 Clarify readme for rails 2.3 users 2012-05-10 19:03:51 -04:00
Ryan Bates 10cbfbb923 adding a .rbenv-version file 2012-05-10 14:24:13 -07:00
Ryan Bates a8a85f13a3 Merge pull request #541 from icrowley/master 
Fixed bug with params for actions that build new instances with namespaced models
 2012-05-10 13:51:45 -07:00
Ryan Bates c1f7181336 Merge pull request #505 from nertzy/update_with_model 
Use latest with_model gem
 2012-05-10 11:45:27 -07:00
Ryan Bates 70515de8c1 Merge pull request #556 from mauriciozaffari/master 
Pass forward :if and :unless options to the before filter.
 2012-05-10 11:00:32 -07:00
Ryan Bates b73bd062a8 Merge pull request #564 from flop/master 
False positives on multiple nested abilities definitions
 2012-05-10 10:59:08 -07:00
Ryan Bates d1176245e6 Merge pull request #559 from plentz/patch-1 
Adding travis-ci badge
 2012-05-10 10:47:13 -07:00
Ryan Bates 78e1a17258 Merge pull request #587 from route/patch-1 
Just add singleton to description of authorize_resource
 2012-05-10 09:27:03 -07:00
Ryan Bates 6e8bc851be Merge pull request #607 from Mixbook/master 
Added support for value to be Enumerable
 2012-05-10 09:25:59 -07:00
Aryk Grosz 65bbf0e354 Add check for Enumerable as condition value 2012-04-23 00:51:55 -07:00
Ryan Bates aed37cda03 adding project status message to readme 2012-04-17 14:00:30 -07:00
Shailesh Patil 51702e0f7b checked for ActionContoller::Base instead of just ActionContoller 2012-04-03 15:44:41 +05:30
Dmitriy Vorotilin f166b5945a Just add singleton to description of authorize_resource 2012-03-23 01:34:04 +04:00
Florent Piteau ba01349eb0 Don't remove key-value from the subject hash we might want to use it again. 2012-02-29 15:49:19 +01:00
Diego Plentz 37a42e3666 adding travis-ci badge 2012-02-14 23:41:18 -02:00
Mauricio Zaffari 83e2dcebd0 Pass forward :if and :unless options to the before filter. i.e: 
load_and_authorize_resource :if => condition == true
 2012-02-02 21:06:38 -02:00
Dmitry Afanasyev baadcb923b Fixed bug with params for actions that build new instances with namespaced models 2012-01-06 01:21:11 +04:00
Manuel Meurer e65f9bd4fd Fixed typo 2011-12-25 19:55:35 +01:00
Artem Kornienko f18f53c9ce Fixed problem with 'with_model' gem in DataMapper tests and Mongoid tests. 2011-11-09 18:38:19 +02:00
Grant Hutchins 98312940e4 Use latest with_model gem 
Now with_model clears the association class cache
between specs, which fixes a test pollution
problem.
 2011-11-02 22:37:37 -04:00
Roger Campos 7797b37c7e Adding Ability#merge 2011-10-31 14:08:50 +01:00
soopa 80ceaf8e17 fix uninitialized constant warning in CanCan::Rule#model_adapter 2011-10-14 20:06:43 -05:00
Ryan Bates 9eebeb2155 releasing 1.6.7 with nested resource fix 1.6.7 2011-10-04 15:04:28 -07:00
Ryan Bates 67a3038628 quick fix to get nested resources working again - closes #482 2011-10-04 15:02:59 -07:00
Ryan Bates 26b40f2b49 releasing version 1.6.6 1.6.6 2011-09-28 17:00:32 -07:00
Ryan Bates 98326394f0 removing jruby/rubinius from travis.yml for now until I figure out why they aren't passing 2011-09-28 16:24:03 -07:00
Patrick Morgan b3fc5add34 Correct "return cant jump across threads" error when using check_authorization() 2011-09-28 16:05:38 -07:00
Ryan Bates 610d7e3ec4 Merge pull request #425 from skhisma/master 
Allow custom IDs to be specified when calling load_resource
 2011-09-28 13:44:19 -07:00