5a55180b95 
								
							 
						 
						
							
							
								
								Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests. 
							
						 
						
							2024-09-04 19:38:52 +02:00  
				
					
						
							
							
								 
						
							
								f1003b2560 
								
							 
						 
						
							
							
								
								Enable "zero monkey patching" mode in RSpec ( #31614 )  
							
							
							
						 
						
							2024-09-04 05:12:25 +00:00  
				
					
						
							
							
								 
						
							
								f214813919 
								
							 
						 
						
							
							
								
								Adapt settings spec to glitch-soc  
							
							
							
						 
						
							2024-06-11 19:54:27 +02:00  
				
					
						
							
							
								 
						
							
								edf6d64eeb 
								
							 
						 
						
							
							
								
								Use correct params in `settings/preferences/appearance` spec ( #30379 )  
							
							
							
						 
						
							2024-06-11 07:36:46 +00:00  
				
					
						
							
							
								 
						
							
								50b17f7e10 
								
							 
						 
						
							
							
								
								Add notification policies and notification requests ( #29366 )  
							
							
							
						 
						
							2024-03-07 14:53:37 +00:00  
				
					
						
							
							
								 
						
							
								cdc57c74b7 
								
							 
						 
						
							
							
								
								Fix unsupported time zone or locale preventing sign-up ( #28035 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-11-22 11:38:07 +00:00  
				
					
						
							
							
								 
						
							
								9dc3ce878b 
								
							 
						 
						
							
							
								
								Speed-up in `Settings::` controllers specs ( #27808 )  
							
							
							
						 
						
							2023-11-10 15:13:42 +00:00  
				
					
						
							
							
								 
						
							
								08fb9d300a 
								
							 
						 
						
							
							
								
								Spec coverage for settings/preferences/* controllers ( #24825 )  
							
							
							
						 
						
							2023-05-04 05:44:27 +02:00  
				
					
						
							
							
								 
						
							
								e98c86050a 
								
							 
						 
						
							
							
								
								Refactor `Cache-Control` and `Vary` definitions ( #24347 )  
							
							
							
						 
						
							2023-04-19 16:07:29 +02:00  
				
					
						
							
							
								 
						
							
								36eeb70d53 
								
							 
						 
						
							
							
								
								Spec coverage on Settings/ controllers specs ( #24221 )  
							
							
							
						 
						
							2023-04-11 11:35:39 +02:00  
				
					
						
							
							
								 
						
							
								a9b5598c97 
								
							 
						 
						
							
							
								
								Change user settings to be stored in a more optimal way ( #23630 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-03-30 14:44:00 +02:00  
				
					
						
							
							
								 
						
							
								6a57c42316 
								
							 
						 
						
							
							
								
								Settings controllers specs ( #23915 )  
							
							
							
						 
						
							2023-03-04 16:56:43 +01:00  
				
					
						
							
							
								 
						
							
								84cc805cae 
								
							 
						 
						
							
							
								
								Enable Style/FrozenStringLiteralComment for specs ( #23790 )  
							
							
							
						 
						
							2023-02-22 09:55:31 +09:00  
				
					
						
							
							
								 
						
							
								bf785df9fe 
								
							 
						 
						
							
							
								
								Audofix Rubocop Style/WordArray ( #23739 )  
							
							
							
						 
						
							2023-02-20 06:14:10 +01:00  
				
					
						
							
							
								 
						
							
								5069769cbe 
								
							 
						 
						
							
							
								
								Autofix Rubocop Style/TrailingCommaInHashLiteral ( #23693 )  
							
							
							
						 
						
							2023-02-18 23:33:41 +09:00  
				
					
						
							
							
								 
						
							
								e34dd3644c 
								
							 
						 
						
							
							
								
								Remove unused `filtered_languages` column ( #18533 )  
							
							... 
							
							
							
							* Remove unused `filtered_languages` column
Fixes  #18522 
* Fix tests 
							
						 
						
							2022-05-27 20:05:22 +02:00  
				
					
						
							
							
								 
						
							
								560ec24e58 
								
							 
						 
						
							
							
								
								Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )  
							
							
							
						 
						
							2019-06-07 16:51:08 +02:00  
				
					
						
							
							
								 
						
							
								1db4117030 
								
							 
						 
						
							
							
								
								Change preferences page into appearance, notifications, and other ( #10977 )  
							
							
							
						 
						
							2019-06-07 03:39:24 +02:00