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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolás Hock Isaza 
							
						 
					 
					
						
						
						
						
							
						
						
							1c3e61725f 
							
						 
					 
					
						
						
							
							Change the i18n default name to :"unauthorized.default"  
						
						 
						
						
						
						
							
						
					 
					
						2011-07-01 13:10:20 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolás Hock Isaza 
							
						 
					 
					
						
						
						
						
							
						
						
							71f60bc4ac 
							
						 
					 
					
						
						
							
							Adding tests for i18n translation for default messages  
						
						 
						
						
						
						
							
						
					 
					
						2011-06-30 18:16:47 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolás Hock Isaza 
							
						 
					 
					
						
						
						
						
							
						
						
							596ad235a9 
							
						 
					 
					
						
						
							
							Make CanCan Default Message a translatable text. Default to the one you had.  
						
						 
						
						
						
						
							
						
					 
					
						2011-06-30 13:22:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							613ab1c1ab 
							
						 
					 
					
						
						
							
							delegating ControllerResource find to model adapter, uses 'get' for DataMapper -  closes   #373  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-21 13:57:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							c031f82dd2 
							
						 
					 
					
						
						
							
							allow :find_by option to be full find method name -  closes   #335  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-19 23:37:36 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							6a01427317 
							
						 
					 
					
						
						
							
							releasing 1.6.5  
						
						 
						
						
						
						
							
  1.6.5
 
						
					 
					
						2011-05-18 13:24:14 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							843fe89c63 
							
						 
					 
					
						
						
							
							pass action and subject through AccessDenied exception when :through isn't found -  closes   #366  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-18 12:58:02 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							74c9d582b2 
							
						 
					 
					
						
						
							
							Merge pull request  #363  from rahearn/mongoid-conditions-empty  
						
						 
						
						... 
						
						
						
						Fixes bug in mongoid_adapter with empty conditions hash 
						
						
							
						
					 
					
						2011-05-17 10:22:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							4e4c5a9a7f 
							
						 
					 
					
						
						
							
							adding current_ability to helper methods -  closes   #361  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-17 13:21:11 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							dde88c92b7 
							
						 
					 
					
						
						
							
							allow :through option to work with private controller methods -  closes   #360  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-17 13:18:31 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							cb9777be5f 
							
						 
					 
					
						
						
							
							ensure Mongoid::Document is defined before loading Mongoid adapter -  closes   #359  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-17 13:16:33 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Ahearn 
							
						 
					 
					
						
						
						
						
							
						
						
							0882450232 
							
						 
					 
					
						
						
							
							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 
						
						
							
						
					 
					
						2011-05-12 09:24:38 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Ahearn 
							
						 
					 
					
						
						
						
						
							
						
						
							ad62d60b20 
							
						 
					 
					
						
						
							
							Fixes bug in mongoid_adapter with empty conditions hash  
						
						 
						
						... 
						
						
						
						* adds mongoid query that matches every record when
rule.conditions.empty? is true 
						
						
							
						
					 
					
						2011-05-10 11:52:29 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							ff13a82dda 
							
						 
					 
					
						
						
							
							Merge pull request  #355  from emmanuel/issue/245.  
						
						 
						
						... 
						
						
						
						DataMapper adapter improvements 
						
						
							
						
					 
					
						2011-05-02 13:52:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Emmanuel Gomez 
							
						 
					 
					
						
						
						
						
							
						
						
							16bdb8d42e 
							
						 
					 
					
						
						
							
							Return empty set early if no can rules are present.  
						
						 
						
						... 
						
						
						
						Thanks dkubb! 
						
						
							
						
					 
					
						2011-04-29 12:04:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Emmanuel Gomez 
							
						 
					 
					
						
						
						
						
							
						
						
							d6851debd4 
							
						 
					 
					
						
						
							
							Fix pending spec for DataMapper adapter.  
						
						 
						
						
						
						
							
						
					 
					
						2011-04-29 00:46:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Emmanuel Gomez 
							
						 
					 
					
						
						
						
						
							
						
						
							6d39b0ae07 
							
						 
					 
					
						
						
							
							Use dkubb's suggestion for evaluating conditions against a Resource.  
						
						 
						
						
						
						
							
						
					 
					
						2011-04-29 00:31:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							a6af47d213 
							
						 
					 
					
						
						
							
							Merged pull request  #352  from cardagin/topic/mongoid-adapter-enhancements.  
						
						 
						
						... 
						
						
						
						Augments Mongoid adapter by handling case where attribute is an array 
						
						
							
						
					 
					
						2011-04-27 09:40:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Feminella 
							
						 
					 
					
						
						
						
						
							
						
						
							17c52a7983 
							
						 
					 
					
						
						
							
							Augments Mongoid adapter by handling case where attribute is an array  
						
						 
						
						
						
						
							
						
					 
					
						2011-04-27 09:54:37 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							18c1007d3f 
							
						 
					 
					
						
						
							
							Merged pull request  #343  from rahearn/mongoid-scope.  
						
						 
						
						... 
						
						
						
						Adds ability to use Scope query with Mongoid 
						
						
							
						
					 
					
						2011-04-25 09:19:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Ahearn 
							
						 
					 
					
						
						
						
						
							
						
						
							2b6204117f 
							
						 
					 
					
						
						
							
							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 
						
						
							
						
					 
					
						2011-04-15 16:58:19 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							b1424dfa49 
							
						 
					 
					
						
						
							
							Merge branch 'optional-associations' of  https://github.com/socialcast/cancan  into socialcast-optional-associations  
						
						 
						
						
						
						
							
						
					 
					
						2011-04-01 15:13:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mitch Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							6aaab9e440 
							
						 
					 
					
						
						
							
							Fixed bug where conditions on an optionally associated object would throw exceptions if the associated object was not present at the rule match time.  
						
						 
						
						
						
						
							
						
					 
					
						2011-04-01 13:20:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Florent Piteau 
							
						 
					 
					
						
						
						
						
							
						
						
							a10243a569 
							
						 
					 
					
						
						
							
							When using an existing scope, it should be merged properly to the class. May  fix   ryanb/cancan#328  :)  
						
						 
						
						
						
						
							
						
					 
					
						2011-04-01 21:25:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Florent Piteau 
							
						 
					 
					
						
						
						
						
							
						
						
							81f00f9024 
							
						 
					 
					
						
						
							
							Failling test for nested resources with a scope for conditions  
						
						 
						
						
						
						
							
						
					 
					
						2011-04-01 18:45:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							7bcfd3d295 
							
						 
					 
					
						
						
							
							releasing 1.6.4  
						
						 
						
						
						
						
							
  1.6.4
 
						
					 
					
						2011-03-29 17:51:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							e96cf5bea4 
							
						 
					 
					
						
						
							
							fixing mongoid 'or' error -  closes   #322  
						
						 
						
						
						
						
							
						
					 
					
						2011-03-29 17:49:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							fb8e9bde57 
							
						 
					 
					
						
						
							
							releasing 1.6.3  
						
						 
						
						
						
						
							
  1.6.3
 
						
					 
					
						2011-03-25 14:28:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							89e40987d8 
							
						 
					 
					
						
						
							
							make sure ActiveRecord::Relation is defined before checking conditions against it so Rails 2 is supported again -  closes   #312  
						
						 
						
						
						
						
							
						
					 
					
						2011-03-25 14:26:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							1ac8099f7a 
							
						 
					 
					
						
						
							
							return subject passed to authorize! -  closes   #314  
						
						 
						
						
						
						
							
						
					 
					
						2011-03-25 14:24:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							5d97cfb236 
							
						 
					 
					
						
						
							
							releasing 1.6.2  
						
						 
						
						
						
						
							
  1.6.2
 
						
					 
					
						2011-03-18 09:44:39 -07:00