Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							ec36137aa6 
							
						 
					 
					
						
						
							
							changing should spec wording  
						
						 
						
						
						
						
							
						
					 
					
						2012-04-22 15:15:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							b37f2d083e 
							
						 
					 
					
						
						
							
							switching to Rspec stubbing/mocking - no more RR  
						
						 
						
						
						
						
							
						
					 
					
						2012-04-22 14:59:32 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							b8ff2dbc6a 
							
						 
					 
					
						
						
							
							load member through method instead of instance variable to improve decent_exposure support  
						
						 
						
						
						
						
							
						
					 
					
						2011-06-13 15:16:08 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							f6c2054f7e 
							
						 
					 
					
						
						
							
							set resource attributes in update action and authorize after set -  closes   #141  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-19 17:12:30 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							a29e31606b 
							
						 
					 
					
						
						
							
							changing the interface for ControllerResource load/authorize so they can be intertwined  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-19 16:38:33 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							e24d5d146b 
							
						 
					 
					
						
						
							
							merging master into 2.0  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-19 16:01:06 -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 Bates 
							
						 
					 
					
						
						
						
						
							
						
						
							5a64d94d09 
							
						 
					 
					
						
						
							
							updating version in gemspec to alpha  
						
						 
						
						
						
						
							
						
					 
					
						2011-05-16 18:02:15 -04:00