Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-08-18 18:04:49 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Adapt github issue template to glitch-soc 
						
					 
				 
				2018-08-19 16:56:42 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix ColumnLink keys in getting_started_misc 
						
					 
				 
				2018-08-22 16:18:23 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Add symbolic link for yarnpkg ( #7894 ) 
						
					 
				 
				2018-06-26 20:34:01 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/master 
						
					 
				 
				2018-08-21 18:24:48 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-08-19 09:27:18 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix redirect link on Tuning.md ( #1595 ) 
						
					 
				 
				2017-04-12 12:40:37 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/master 
						
					 
				 
				2018-08-21 18:24:48 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Initial commit 
						
					 
				 
				2016-02-20 22:53:20 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							[Nanobox] Tuning Update ( #6660 ) 
						
					 
				 
				2018-03-06 21:59:35 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/tentative-merge 
						
					 
				 
				2018-07-09 07:13:59 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/master 
						
					 
				 
				2018-08-21 18:24:48 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix streaming API still using filtered instead of chosen languages ( #8009 ) 
						
					 
				 
				2018-07-14 03:59:31 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									vendor /assets
									
								 
							
						
					 
				 
				
					
						
							
							Initial commit 
						
					 
				 
				2016-02-20 22:53:20 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove debug option from Babel preset env ( #6852 ) 
						
					 
				 
				2018-03-21 10:26:15 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add heroku APT buildpack for scalingo. ( #3051 ) 
						
					 
				 
				2017-05-14 12:57:13 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							fix RuboCop error ( #7442 ) 
						
					 
				 
				2018-06-04 14:49:10 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add .bundle to .dockerignore ( #7895 ) 
						
					 
				 
				2018-06-26 20:33:29 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add final newline to locale files ( #2890 ) 
						
					 
				 
				2017-05-07 19:55:47 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							[Nanobox] Enable ElasticSearch support by default ( #6977 ) 
						
					 
				 
				2018-03-31 13:17:25 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-08-17 17:43:54 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add parallel test processors ( #7215 ) 
						
					 
				 
				2018-04-21 21:36:22 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant 
						
					 
				 
				2017-01-26 19:22:59 +11:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Dev Tooling fixes (eslint/editorconfig) ( #1398 ) 
						
					 
				 
				2017-04-11 00:36:03 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge remote-tracking branch 'origin/master' into gs-master 
						
					 
				 
				2018-06-02 16:15:36 -05:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Replace sprockets/browserify with Webpack ( #2617 ) 
						
					 
				 
				2017-05-03 02:04:16 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add .gitattributes file to avoid unwanted CRLF ( #3954 ) 
						
					 
				 
				2017-06-26 13:15:24 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Ignore elasticsearch directory ( #7070 ) 
						
					 
				 
				2018-04-08 16:57:16 +09:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Rename themes -> flavours ? ? 
						
					 
				 
				2017-12-03 23:26:40 -08:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Added haml-lint and fix warnings ( #2773 ) 
						
					 
				 
				2017-05-08 03:35:25 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove Storybook ( #4397 ) 
						
					 
				 
				2017-07-27 22:30:27 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Upgrade Node.js to v8.x on nvmrc ( #8023 ) 
						
					 
				 
				2018-07-15 12:29:17 +09:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add object-fit polyfill for Edge ( #4182 ) 
						
					 
				 
				2017-07-14 01:59:34 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs ( #3276 ) 
						
					 
				 
				2017-05-24 17:57:33 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Adding a Mention model, test stubs 
						
					 
				 
				2016-02-25 00:17:01 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add post-deployment migration system ( #8182 ) 
						
					 
				 
				2018-08-13 18:17:20 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Update Ruby to version 2.4.4 ( #6964 ) 
						
					 
				 
				2018-04-01 23:43:08 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Enable CodeClimate SCSS Lint checks ( #2886 ) 
						
					 
				 
				2017-05-07 20:47:31 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove Storybook ( #4397 ) 
						
					 
				 
				2017-07-27 22:30:27 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Reduce container size with clean yarn ( #3506 ) 
						
					 
				 
				2017-09-30 22:05:24 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change logo URL for Heroku and Scalingo ( #4476 ) 
						
					 
				 
				2017-08-01 05:59:11 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add dependencies for uWebSockets ( #7466 ) 
						
					 
				 
				2018-07-14 01:47:10 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							docs: Add AUTHORS file ( #6685 ) 
						
					 
				 
				2018-03-09 13:11:43 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							[Nanobox] Enable ElasticSearch support by default ( #6977 ) 
						
					 
				 
				2018-03-31 13:17:25 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							remove capistrano/faster_assets from Capfile ( #2737 ) 
						
					 
				 
				2017-05-03 12:14:52 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							update code of conduct email address 
						
					 
				 
				2017-11-21 11:01:28 -05:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix rubocop issues, introduce usage of frozen literal to improve performance 
						
					 
				 
				2016-11-15 16:56:29 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge remote-tracking branch 'origin/master' into gs-master 
						
					 
				 
				2018-05-04 12:16:12 -05:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Update docker-compose to cope with build-time assets ( #8156 ) 
						
					 
				 
				2018-08-09 22:37:48 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-07-16 14:50:42 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/master 
						
					 
				 
				2018-08-21 18:24:48 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/master 
						
					 
				 
				2018-08-21 18:24:48 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Removed glitch tests 
						
					 
				 
				2017-11-17 19:29:17 -08:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix   #49  - License changed from GPL-2.0 to AGPL-3.0 
						
					 
				 
				2016-09-21 23:04:34 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-08-01 00:18:13 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							TOR federation ( #7875 ) 
						
					 
				 
				2018-06-26 20:34:12 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							More robust PuSH subscription refreshes ( #2799 ) 
						
					 
				 
				2017-05-05 02:23:01 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix Procfile on OS X ( #6748 ) 
						
					 
				 
				2018-03-12 03:50:40 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Initial commit 
						
					 
				 
				2016-02-20 22:53:20 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge upstream ( #111 ) 
						
					 
				 
				2017-08-01 13:20:29 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix Unknown addon provider in scalingo.json ( #7928 ) 
						
					 
				 
				2018-07-03 09:09:21 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							dockerfile: Give more stack space to /sbin/tini. 
						
					 
				 
				2018-01-11 04:09:16 -06:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-08-01 22:20:25 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-08-01 00:18:13 +02:00