Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fe44af45d
							
						
					 | 
					
						
						
							
							be more clear about blocks not working with accessible_by - closes #130
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-30 13:40:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							a10a38c82f
							
						
					 | 
					
						
						
							
							releasing version 1.3.3
						
						
						
						
						
						
							
 1.3.3
						
					 | 
					
						2010-08-20 16:27:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							caed4fcee5
							
						
					 | 
					
						
						
							
							use RSpec namespace for matcher - closes #119
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-18 16:22:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							e893e12260
							
						
					 | 
					
						
						
							
							fixing broken spec and minor improvements to tableized_conditions method
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-18 16:04:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								McClain Looney
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d7742ea43
							
						
					 | 
					
						
						
							
							fix for bug 123
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-17 09:33:11 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							a566ea0f4f
							
						
					 | 
					
						
						
							
							releasing version 1.3.2 which fixes slice error when passing custom resource name
						
						
						
						
						
						
							
 1.3.2
						
					 | 
					
						2010-08-07 08:38:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							333ddf1970
							
						
					 | 
					
						
						
							
							properly pass along resource name without slice error - closes #112
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-07 08:33:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd74267364
							
						
					 | 
					
						
						
							
							releasing version 1.3.1 with sanitize_sql fix
						
						
						
						
						
						
							
 1.3.1
						
					 | 
					
						2010-08-06 23:28:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8631dcc93
							
						
					 | 
					
						
						
							
							fixing error on protected sanitize_sql - closes #111
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 23:24:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a17586eb3
							
						
					 | 
					
						
						
							
							releasing version 1.3.0
						
						
						
						
						
						
							
 1.3.0
						
					 | 
					
						2010-08-06 16:00:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							13427e18d5
							
						
					 | 
					
						
						
							
							updating readme
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 15:54:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							1dccc0252a
							
						
					 | 
					
						
						
							
							removing :resource option from rdocs since it's not longer used
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 15:05:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							75ce2bdefa
							
						
					 | 
					
						
						
							
							allow :parent => false option to work in load/authorize resource
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 14:26:57 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9e0f4e3ef
							
						
					 | 
					
						
						
							
							renaming :singular resource option to :singleton
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 13:06:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d9e710f05
							
						
					 | 
					
						
						
							
							updating changelog
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 11:42:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							236cece3b3
							
						
					 | 
					
						
						
							
							adding :find_by option to load_resource - closes #19
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 11:18:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							84f4c904b7
							
						
					 | 
					
						
						
							
							adding :singular option to support has_one associations in load/authorize resource - closes #93
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 11:03:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							6998e8bdd1
							
						
					 | 
					
						
						
							
							support multiple resources in :through option of load_resource, this makes polymorphic associations possible - closes #73
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 10:35:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							961b8c2477
							
						
					 | 
					
						
						
							
							consider ancestors when matching classes in Ability#can, this way it works with STI - closes #55
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 10:06:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							a157b65fbf
							
						
					 | 
					
						
						
							
							adding :instance_name option to load/authorize_resource - closes #44
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 09:35:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							47f0aa597e
							
						
					 | 
					
						
						
							
							change how params are passed to ControllerResource and use HashWithIndifferentAccess in tests
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-06 09:24:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							67b069579e
							
						
					 | 
					
						
						
							
							don't pass nil to 'new' call when no params are specified - closes #63
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-05 16:52:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							156839b73e
							
						
					 | 
					
						
						
							
							only use the :read action when authorizing parent resources
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-05 16:24:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							25a1c553bf
							
						
					 | 
					
						
						
							
							adding :through option to replace :nesting option and moving ResourceAuthorization class code into ControllerResource
						
						
						
						
						
						
							
						
					 | 
					
						2010-08-05 16:12:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dee01195d
							
						
					 | 
					
						
						
							
							improving inline documentation for Query
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-21 12:16:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							5eae169d7b
							
						
					 | 
					
						
						
							
							mentioning CanCan contributors in README
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-21 12:06:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							66ff1f2ea3
							
						
					 | 
					
						
						
							
							removing metrics link in readme, farewell Caliper :(
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-21 12:02:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							18dcf2a121
							
						
					 | 
					
						
						
							
							mention Rails 3 installation in README - closes #56
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-21 11:59:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b26f4d767
							
						
					 | 
					
						
						
							
							fixing specs for older versions of ruby and rspec
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-21 11:56:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							25637bb33a
							
						
					 | 
					
						
						
							
							removing extra white space at end of lines
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-21 11:45:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5737f6d28
							
						
					 | 
					
						
						
							
							adding thanks to changelog
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-20 17:11:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							1659f21bb3
							
						
					 | 
					
						
						
							
							updating changelong with support for multiple can calls in accessible_by - closes #71
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-20 17:09:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba8cb3cf6d
							
						
					 | 
					
						
						
							
							refactoring query.joins
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-20 17:05:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							e098ddaacd
							
						
					 | 
					
						
						
							
							refactoring query.conditions
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-20 16:00:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							964a4765b1
							
						
					 | 
					
						
						
							
							removing need to pass tableize option around for query conditions
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-20 13:43:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							a42e067f3b
							
						
					 | 
					
						
						
							
							extracting out Query class for generating sql conditions and association joins
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-20 13:20:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							60848143b7
							
						
					 | 
					
						
						
							
							refactoring can definition matching behavior
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-20 11:04:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d8f04363d
							
						
					 | 
					
						
						
							
							merging with master and resolving a couple conflicts
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-19 16:36:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							cad425989e
							
						
					 | 
					
						
						
							
							supporting deeply nested aliases - closes #98
						
						
						
						
						
						
							
						
					 | 
					
						2010-07-19 16:03:09 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b4377cbf3
							
						
					 | 
					
						
						
							
							releasing version 1.2.0
						
						
						
						
						
						
							
 1.2.0
						
					 | 
					
						2010-07-19 09:21:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yura Sokolov
							
						 
					 | 
					
						
						
						
						
							
						
						
							75eb1917f9
							
						
					 | 
					
						
						
							
							add test for single cannot definition
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-25 14:28:29 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yura Sokolov
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fd793090a
							
						
					 | 
					
						
						
							
							fix logic error for single cannot condition - it should return no records
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-25 14:09:01 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yura Sokolov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac19422a90
							
						
					 | 
					
						
						
							
							add tests for merging conditions and joins
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-25 14:02:26 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yura Sokolov
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c0346b90b
							
						
					 | 
					
						
						
							
							can accept array for sql sanitizing in conditions
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-25 14:01:53 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yura Sokolov
							
						 
					 | 
					
						
						
						
						
							
						
						
							b473d8827f
							
						
					 | 
					
						
						
							
							CanDefinition#only_block?
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-25 12:23:39 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yura Sokolov
							
						 
					 | 
					
						
						
						
						
							
						
						
							bcab8d6369
							
						
					 | 
					
						
						
							
							fix error with single cannot condition
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-25 12:14:01 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yura Sokolov
							
						 
					 | 
					
						
						
						
						
							
						
						
							dbc1538054
							
						
					 | 
					
						
						
							
							small refactoring: CanDefinition #definitive? #conditions_empty?
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-24 18:15:20 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yura Sokolov
							
						 
					 | 
					
						
						
						
						
							
						
						
							46f03013f3
							
						
					 | 
					
						
						
							
							Merge remote branch 'upstream/master'
						
						
						
						
						
						
						
						Conflicts:
	lib/cancan/ability.rb
	lib/cancan/active_record_additions.rb
	lib/cancan/can_definition.rb
	spec/cancan/ability_spec.rb 
						
						
							
						
					 | 
					
						2010-05-24 15:17:10 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ade44221a
							
						
					 | 
					
						
						
							
							load parent resources for collection actions such 'index'
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-21 15:22:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Bates
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a3dd85a18
							
						
					 | 
					
						
						
							
							adding :name option to load_and_authorize_resource if it does not match controller - closes #65
						
						
						
						
						
						
							
						
					 | 
					
						2010-05-21 14:20:45 -07:00 | 
					
					
						
						
							
							
							
						
					 |