Merge remote-tracking branch 'origin/master' into gs-master 
						
					 
				 
				2018-05-03 17:23:44 -05:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Add post-deployment migration system ( #8182 ) 
						
					 
				 
				2018-08-13 18:17:20 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Added endorse strings, fixed footer 'developers' string ( #8183 ) 
						
					 
				 
				2018-08-13 18:17:20 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Reduce assets precompilation time by about 20% 
						
					 
				 
				2018-07-28 23:24:41 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-07-26 21:22:43 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Upgrade Rails to version 5.2.0 ( #5898 ) 
						
					 
				 
				2018-04-12 14:45:17 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Save video metadata and improve video OpenGraph tags ( #6481 ) 
						
					 
				 
				2018-02-16 07:22:20 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							use-DB_NAME-in-development ( #5430 ) 
						
					 
				 
				2017-10-17 11:45:37 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Update dependencies for Ruby (2018-04-23) ( #7237 ) 
						
					 
				 
				2018-04-23 11:29:17 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Make PreviewCard records reuseable between statuses ( #4642 ) 
						
					 
				 
				2017-09-01 16:20:16 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Ignore tootsuite-specific theme-related translation strings 
						
					 
				 
				2018-05-10 00:03:34 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-07-17 22:05:25 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Do not set port for puma if it is bound to unix socket ( #2289 ) 
						
					 
				 
				2017-04-22 01:22:20 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-08-10 16:22:31 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Upgrade to Rails 5.0.0.1 
						
					 
				 
				2016-08-17 17:58:00 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-08-01 22:20:25 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Account archive download ( #6460 ) 
						
					 
				 
				2018-02-21 23:21:32 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Finalized theme loading and stuff 
						
					 
				 
				2017-11-20 22:13:37 -08:00