Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-10-02 18:46:22 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-12-15 20:25:25 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							change reaction api to match other interactions 
						
					 
				 
				2022-12-20 18:27:52 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-12-15 20:25:25 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-12-15 20:25:25 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-03-02 18:02:48 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix error when accessing /filters/:id/statuses on glitch-soc ( #1837 ) 
						
					 
				 
				2022-08-31 11:55:27 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-11-17 21:56:05 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							make number of visible reactions a vanilla setting 
						
					 
				 
				2022-12-20 18:27:46 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Remove Keybase integration ( #17045 ) 
						
					 
				 
				2021-11-26 05:58:18 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change public accounts pages to mount the web UI ( #19319 ) 
						
					 
				 
				2022-10-20 14:35:29 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-11-17 12:01:37 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-07-05 09:33:44 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-05-01 16:52:27 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add customizable user roles ( #18641 ) 
						
					 
				 
				2022-07-05 02:41:40 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add (back) rails-level JSON caching ( #11333 ) 
						
					 
				 
				2019-07-21 22:32:16 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-08-25 05:07:39 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-12-15 20:25:25 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix single name variables on controller folder ( #20092 ) 
						
					 
				 
				2022-12-15 17:11:58 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change health check ( #15988 ) 
						
					 
				 
				2021-04-03 02:39:04 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change public accounts pages to mount the web UI ( #19319 ) 
						
					 
				 
				2022-10-20 14:35:29 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix instance actor not being dereferenceable ( #17457 ) 
						
					 
				 
				2022-02-06 15:31:03 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor controllers for statuses, accounts, and more ( #11249 ) 
						
					 
				 
				2019-07-08 12:03:45 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2019-08-19 21:49:35 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix redirecting non-functional accounts on public pages ( #11978 ) 
						
					 
				 
				2019-09-28 01:33:27 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-12-15 20:25:25 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor how Redis locks are created ( #18400 ) 
						
					 
				 
				2022-05-13 00:02:35 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change public accounts pages to mount the web UI ( #19319 ) 
						
					 
				 
				2022-10-20 14:35:29 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2020-11-12 22:13:57 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2019-08-19 21:49:35 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-11-17 12:01:37 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'main' into glitch-soc/merge-upstream 
						
					 
				 
				2022-12-15 20:25:25 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix single name variables on controller folder ( #20092 ) 
						
					 
				 
				2022-12-15 17:11:58 +01:00