Ryan Bates
b37f2d083e
switching to Rspec stubbing/mocking - no more RR
2012-04-22 14:59:32 -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
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
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
c94de4ab18
include namespace in params when creating/updating resource - closes #349
2011-09-28 16:00:46 -07:00
Ryan Bates
6de9e4675a
consider specificity when finding relevant rules so generic rules will not override specific ones - closes #321
2011-09-28 15:34:08 -07:00
Ryan Bates
1fb2c0160c
ignore cannot clause with attributes when not checking for with attributes - closes #406
2011-09-28 14:48:26 -07:00
Jan Vlnas
aa83fee7a4
Add failing example of cannot for attribute, corresponds to #406
2011-09-28 14:11:43 -07:00
Ryan Bates
eafd6cfcde
fixing spec for new id_param option
2011-09-28 13:50:46 -07:00
Ryan Bates
67c93619c1
Merge branch 'master' into 2.0
2011-09-28 13:45:49 -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
Ryan Bates
092b510a2f
fixing namespace controller resource spec
2011-09-28 13:43:34 -07:00
Ryan Bates
2160183e86
Merge branch 'master' into 2.0
2011-09-28 13:35:52 -07:00
Ryan Bates
cfb801ed8d
Merge pull request #424 from whilefalse/master
...
Support for namespaced models and engines
2011-09-28 13:34:30 -07:00
Ryan Bates
0edd310c41
Merge pull request #476 from kirkconnell/with_model-version-fix
...
Specs fail when running in a freshly installed environment.
2011-09-28 11:57:17 -07:00
Ryan Bates
86063e4846
merging 1.6 additions into 2.0 branch
2011-09-28 11:39:26 -07:00
Ryan Bates
0442634d5a
fixing ability generator
2011-09-28 11:18:12 -07:00
Ryan Bates
6c1d685f2c
include tests with cancan:ability generator - closes #350
2011-09-28 11:02:18 -07:00
Ryan Bates
6ef2c44f57
fixing model comparison spec, I believe this bug is caused by recent version of with_model
2011-09-28 10:08:21 -07:00
kirkconnell
5ab7dea2f0
use version 1.x of with_model to avoid errors in class comparisons
2011-09-20 18:43:39 -06:00
Ryan Bates
916f97fbf3
updating Rails gem dev dependency
2011-07-23 19:53:18 -07:00
Ryan Bates
2be3f98e11
removing 1.9.2 from .travis.yml
2011-07-23 19:33:43 -07:00
Ryan Bates
0343f8f0b5
Merge pull request #427 from bai/master
...
Add .travis.yml for building cancan on a lovely Travis CI service
2011-07-23 19:31:45 -07:00
Ryan Bates
987dce0dc2
Merge pull request #421 from amc-projects/master
...
Compatibility fix for rspec-instafail and rspec1
2011-07-23 14:46:37 -07:00
Ryan Bates
e0492f5d75
Merge pull request #426 from manuelmeurer/patch-1
...
Fixed documentation for skip_load_resource and skip_authorize_resource.
2011-07-23 13:31:03 -07:00
beawesomeinstead
0fc67e4d56
These lines are defaults, should be fine this way
2011-07-21 17:02:12 +03:00
beawesomeinstead
d24ef454e0
Run rake instead of rake test
2011-07-21 15:48:20 +03:00
Manuel Meurer
e561532bab
Fixed typos.
2011-07-21 05:12:09 -07:00
beawesomeinstead
1ab4e2d48c
The first try to make cancan pass on Travis CI
2011-07-21 14:51:47 +03:00
Geoff Parsons
7937a282a3
:id_param option to load_resource allows specification of the param name to find members
2011-07-20 13:42:24 -04:00
Steven Anderson
d35419fa4c
Added the needed camelize to recent patch for engines and namespaced models
2011-07-20 10:03:50 +01:00
Steven Anderson
6c497b8dd9
Added support for engines and namespaced models.
2011-07-20 09:31:53 +01:00
Michael MacDonald
3b33b36de9
Compatibility fix for using cancan with rspec-instafail and rspec1
2011-07-19 10:27:08 +10:00
Ryan Bates
600a3e16a5
Merge pull request #410 from psanford/improve_datamapper_loading
...
Load datamapper class methods via append_extensions.
2011-07-01 13:01:32 -07:00
psanford
ccd7a94d40
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.
2011-07-01 12:48:20 -07:00
Ryan Bates
8f815c422a
Merge pull request #409 from nhocki/patch-1
...
Make CanCan Default Message a translatable text.
2011-07-01 11:44:23 -07:00
