Ash Furrow 
								
							 
						 
						
							
							
							
							
								
							
							
								1eae01edcd 
								
							 
						 
						
							
							
								
								Adds user confirmation rake task ( #1300 )  
							
							... 
							
							
							
							* Adds task to confirm user by email.
* Adds documentation for manual confirmation. 
							
						 
						
							2017-04-09 01:09:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								a42df988b9 
								
							 
						 
						
							
							
								
								Merge pull request  #1115  from vmincev/patch-1  
							
							... 
							
							
							
							Update Production-guide.md 
							
						 
						
							2017-04-08 11:38:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shel R 
								
							 
						 
						
							
							
							
							
								
							
							
								05b6aa25dc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-07 22:59:07 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Huerta 
								
							 
						 
						
							
							
							
							
								
							
							
								9c0ca6f26d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-07 19:46:07 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								714156e409 
								
							 
						 
						
							
							
								
								Merge pull request  #1204  from benklop/patch-1  
							
							... 
							
							
							
							Update Administration-guide.md 
							
						 
						
							2017-04-08 01:00:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									benklop 
								
							 
						 
						
							
							
							
							
								
							
							
								36e31bf45e 
								
							 
						 
						
							
							
								
								Update Administration-guide.md  
							
							... 
							
							
							
							the syntax for running the rake task wasn't correct. 
							
						 
						
							2017-04-07 16:31:50 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Huerta 
								
							 
						 
						
							
							
							
							
								
							
							
								7ab5218c65 
								
							 
						 
						
							
							
								
								Update Heroku-guide.md  
							
							... 
							
							
							
							Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit. 
							
						 
						
							2017-04-07 17:44:32 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Huerta 
								
							 
						 
						
							
							
							
							
								
							
							
								fbfb94ca00 
								
							 
						 
						
							
							
								
								Update Heroku-guide.md  
							
							... 
							
							
							
							Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing. 
							
						 
						
							2017-04-07 17:29:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								f74fb89cbd 
								
							 
						 
						
							
							
								
								Merge pull request  #1191  from d3vgru/master  
							
							... 
							
							
							
							change suggested cipher for nginx 
							
						 
						
							2017-04-07 23:02:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								895201fd9d 
								
							 
						 
						
							
							
								
								Merge pull request  #1172  from mjankowski/mj-heroku-docs  
							
							... 
							
							
							
							Update heroku instructions 
							
						 
						
							2017-04-07 22:50:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									seekr 
								
							 
						 
						
							
							
							
							
								
							
							
								231db3cdc1 
								
							 
						 
						
							
							
								
								typo  
							
							
							
						 
						
							2017-04-07 16:33:13 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ed Knutson 
								
							 
						 
						
							
							
							
							
								
							
							
								26b92ae438 
								
							 
						 
						
							
							
								
								change suggested cipher for nginx  
							
							
							
						 
						
							2017-04-07 14:10:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								5a85b7f4fe 
								
							 
						 
						
							
							
								
								Update heroku instructions  
							
							
							
						 
						
							2017-04-07 12:50:29 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vladimir Mincev 
								
							 
						 
						
							
							
							
							
								
							
							
								bfe3d5a719 
								
							 
						 
						
							
							
								
								Update Production-guide.md  
							
							... 
							
							
							
							Under ## General dependencies:
apt-get needs sudo and install was typed wrongly. 
							
						 
						
							2017-04-07 01:05:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								9df50099a1 
								
							 
						 
						
							
							
								
								Merge pull request  #1042  from johnsudaar/feature/scalingo_one_click  
							
							... 
							
							
							
							Cosmetic changes to the scalingo deployment 
							
						 
						
							2017-04-06 19:32:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								d1527b2d94 
								
							 
						 
						
							
							
								
								Linux users must enable NFS for Vagrant  
							
							
							
						 
						
							2017-04-06 12:16:39 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Hurter 
								
							 
						 
						
							
							
							
							
								
							
							
								f210b2b7ef 
								
							 
						 
						
							
							
								
								Make scalingo doc clearer  
							
							
							
						 
						
							2017-04-05 17:48:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								b89f37e445 
								
							 
						 
						
							
							
								
								Merge pull request  #947  from johnsudaar/feature/scalingo_one_click  
							
							... 
							
							
							
							Add Scalingo deployment support 
							
						 
						
							2017-04-05 16:50:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Hurter 
								
							 
						 
						
							
							
							
							
								
							
							
								8752dc9186 
								
							 
						 
						
							
							
								
								Add doc  
							
							
							
						 
						
							2017-04-05 16:00:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angristan 
								
							 
						 
						
							
							
							
							
								
							
							
								0bd1bdfc44 
								
							 
						 
						
							
							
								
								Add git and curl as dependencies  
							
							... 
							
							
							
							In some VPS templates, they are not installed by default. 
							
						 
						
							2017-04-05 14:11:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angristan 
								
							 
						 
						
							
							
							
							
								
							
							
								53a01b38b2 
								
							 
						 
						
							
							
								
								ECDH only  
							
							... 
							
							
							
							Disable DHE ciphers. We don't loose any compatibility as we already use TLS 1.2, and ECDH is faster and safer.
Also, it's better so specify the curve.
This is the conf I use here : https://tls.imirhil.fr/https/mstdn.io  
							
						 
						
							2017-04-05 10:44:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Snell 
								
							 
						 
						
							
							
							
							
								
							
							
								413d87cd50 
								
							 
						 
						
							
							
								
								SSL best practices for nginx  
							
							
							
						 
						
							2017-04-04 18:43:21 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								1bb3d8d3f5 
								
							 
						 
						
							
							
								
								Merge pull request  #885  from optikfluffel/patch-1  
							
							... 
							
							
							
							Update Production-guide.md 
							
						 
						
							2017-04-05 03:24:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								0662ab35eb 
								
							 
						 
						
							
							
								
								Merge pull request  #842  from Angristan/patch-2  
							
							... 
							
							
							
							Missing quotes 
							
						 
						
							2017-04-05 03:08:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								b3523a6a8d 
								
							 
						 
						
							
							
								
								Merge pull request  #854  from Angristan/patch-3  
							
							... 
							
							
							
							Fix crontab edit 
							
						 
						
							2017-04-05 03:07:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								ae1b33d594 
								
							 
						 
						
							
							
								
								Merge pull request  #891  from ashfurrow/patch-1  
							
							... 
							
							
							
							Adds instructions for adding admin users for Heroku installs 
							
						 
						
							2017-04-05 03:01:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ash Furrow 
								
							 
						 
						
							
							
							
							
								
							
							
								bd371b6adb 
								
							 
						 
						
							
							
								
								Updates instructions.  
							
							
							
						 
						
							2017-04-04 20:53:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								a5f1a6bf01 
								
							 
						 
						
							
							
								
								Merge pull request  #872  from kwaio/patch-1  
							
							... 
							
							
							
							typo in admin doc 
							
						 
						
							2017-04-05 02:53:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ash Furrow 
								
							 
						 
						
							
							
							
							
								
							
							
								5e8e8ba01d 
								
							 
						 
						
							
							
								
								Adds instructions for adding admin users.  
							
							
							
						 
						
							2017-04-04 18:45:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Udo Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa339d3ff 
								
							 
						 
						
							
							
								
								Update Production-guide.md  
							
							
							
						 
						
							2017-04-04 23:45:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nope Nope 
								
							 
						 
						
							
							
							
							
								
							
							
								583208f5ae 
								
							 
						 
						
							
							
								
								typo in admin doc  
							
							... 
							
							
							
							s/rails/rake/ 
							
						 
						
							2017-04-04 20:45:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angristan 
								
							 
						 
						
							
							
							
							
								
							
							
								1447ba504b 
								
							 
						 
						
							
							
								
								Add file package  
							
							... 
							
							
							
							If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media. 
							
						 
						
							2017-04-04 19:23:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angristan 
								
							 
						 
						
							
							
							
							
								
							
							
								3ab29e5a9d 
								
							 
						 
						
							
							
								
								Fix crontab edit  
							
							... 
							
							
							
							Missing -u parameter to specify the mastodon user. 
							
						 
						
							2017-04-04 17:23:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angristan 
								
							 
						 
						
							
							
							
							
								
							
							
								aee8798179 
								
							 
						 
						
							
							
								
								Missing quotes  
							
							
							
						 
						
							2017-04-04 15:57:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									walfie 
								
							 
						 
						
							
							
							
							
								
							
							
								766eabf194 
								
							 
						 
						
							
							
								
								Fix typo in Heroku guide  
							
							
							
						 
						
							2017-04-04 00:00:56 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8eca42b265 
								
							 
						 
						
							
							
								
								Separate background jobs into different queues. ATTENTION: new queue "pull"  
							
							... 
							
							
							
							must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them. 
							
						 
						
							2017-04-04 00:53:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valentin Lorentz 
								
							 
						 
						
							
							
							
							
								
							
							
								02fac04fc5 
								
							 
						 
						
							
							
								
								Also fix the start command.  
							
							
							
						 
						
							2017-04-03 00:10:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valentin Lorentz 
								
							 
						 
						
							
							
							
							
								
							
							
								e089c66083 
								
							 
						 
						
							
							
								
								Fix install instructions.  
							
							... 
							
							
							
							Closes GH-745. 
							
						 
						
							2017-04-03 00:08:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5157e25aab 
								
							 
						 
						
							
							
								
								Add tuning documentation, add <content> tags back to most salmons,  
							
							... 
							
							
							
							make status pagination headers generation more lax about next page
existing 
							
						 
						
							2017-02-25 03:34:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tom McAtee 
								
							 
						 
						
							
							
							
							
								
							
							
								525d615fd7 
								
							 
						 
						
							
							
								
								Fixed the URL  
							
							... 
							
							
							
							Heroku uses the referrer URL to point at the repo that should be deployed; from this page that includes part of a path that breaks the deployment (specifically /blob/master/docs/Running-Mastodon/Heroku-guide.md).
I've replaced the vanilla address with one that includes a specific reference to the root of the repo 
							
						 
						
							2017-02-14 12:46:18 +10:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1e94617a09 
								
							 
						 
						
							
							
								
								Add rake task for making someone into an admin  
							
							
							
						 
						
							2017-02-13 20:42:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								78552ab850 
								
							 
						 
						
							
							
								
								Add postgres setup instructions to docs  
							
							
							
						 
						
							2017-02-07 23:57:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd2b6be86 
								
							 
						 
						
							
							
								
								Make the streaming API also handle websockets (because trying to get the browser EventSource interface to  
							
							... 
							
							
							
							work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand. 
							
						 
						
							2017-02-04 00:34:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								0a909f2e6b 
								
							 
						 
						
							
							
								
								Add default account details to developer documentation.  
							
							
							
						 
						
							2017-01-27 02:03:13 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								65748b7623 
								
							 
						 
						
							
							
								
								Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'.  
							
							
							
						 
						
							2017-01-22 19:50:40 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								954f82410c 
								
							 
						 
						
							
							
								
								Add wiki contents to docs/ instead  
							
							
							
						 
						
							2017-01-21 22:51:02 +01:00