65ca37bbaa 
								
							 
						 
						
							
							
								
								Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes. 
							
						 
						
							2024-03-13 20:14:18 +01:00  
				
					
						
							
							
								 
						
							
								6262ceeb70 
								
							 
						 
						
							
							
								
								Fix `RSpec/DescribedClass` cop ( #29472 )  
							
							
							
						 
						
							2024-03-13 15:42:39 +00:00  
				
					
						
							
							
								 
						
							
								4113fbf6e8 
								
							 
						 
						
							
							
								
								Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules. 
							
						 
						
							2023-12-17 23:04:16 +01:00  
				
					
						
							
							
								 
						
							
								d6f50839e1 
								
							 
						 
						
							
							
								
								Fix `RSpec/SpecFilePathFormat` cops ( #27730 )  
							
							
							
						 
						
							2023-11-06 16:25:40 +00:00