Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								70a7f72fda 
								
							 
						 
						
							
							
								
								Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-11 14:12:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a441df3e19 
								
							 
						 
						
							
							
								
								Bump version to 2.5.1 ( #8953 )  
							
							
							
						 
						
							2018-10-11 02:29:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b9e620946c 
								
							 
						 
						
							
							
								
								Fix typo in ActivityPub Create handler ( #8952 )  
							
							... 
							
							
							
							Regression from #8951  
							
						 
						
							2018-10-11 02:10:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8efdf1a898 
								
							 
						 
						
							
							
								
								Do not push DMs into the home feed ( #8940 )  
							
							... 
							
							
							
							* Do not push DMs into the home feed
* Show DMs column after sending a DM, if DMs column is not already shown 
							
						 
						
							2018-10-11 01:31:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ce087ef889 
								
							 
						 
						
							
							
								
								Move network calls out of transaction in ActivityPub handler ( #8951 )  
							
							... 
							
							
							
							Mention and emoji code may perform network calls, but does not need
to do that inside the database transaction. This may improve availability
of database connections when using pgBouncer in transaction mode. 
							
						 
						
							2018-10-11 00:50:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								0167397218 
								
							 
						 
						
							
							
								
								Bump better_errors from 2.4.0 to 2.5.0 ( #8946 )  
							
							... 
							
							
							
							Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-10 19:36:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bf559a477a 
								
							 
						 
						
							
							
								
								Really fix HotKeys  
							
							
							
						 
						
							2018-10-10 17:40:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								9c66e239d1 
								
							 
						 
						
							
							
								
								Bump bullet from 5.7.5 to 5.7.6 ( #8947 )  
							
							... 
							
							
							
							Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-10 22:09:53 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								de89e3670e 
								
							 
						 
						
							
							
								
								Bump scss_lint from 0.57.0 to 0.57.1 ( #8948 )  
							
							... 
							
							
							
							Bumps [scss_lint](https://github.com/brigade/scss-lint ) from 0.57.0 to 0.57.1.
- [Release notes](https://github.com/brigade/scss-lint/releases )
- [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-10 22:09:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								af3ef0afb0 
								
							 
						 
						
							
							
								
								Add description meta tag additionally to og:description ( #8941 )  
							
							... 
							
							
							
							Fix  #8685  
						
							2018-10-10 02:21:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c227151023 
								
							 
						 
						
							
							
								
								Add dns-prefetch if using different host for assets or uploads ( #8942 )  
							
							
							
						 
						
							2018-10-10 01:31:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8cb843039c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js 
							
						 
						
							2018-10-09 21:08:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								02b17344fd 
								
							 
						 
						
							
							
								
								Bump capistrano-rails from 1.3.1 to 1.4.0 ( #8936 )  
							
							... 
							
							
							
							Bumps [capistrano-rails](https://github.com/capistrano/rails ) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases )
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-09 19:43:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								a1be1d17fe 
								
							 
						 
						
							
							
								
								Bump dotenv-rails from 2.2.2 to 2.5.0 ( #8934 )  
							
							... 
							
							
							
							Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.2.2 to 2.5.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-09 19:43:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								cf43973ecd 
								
							 
						 
						
							
							
								
								Fix that the copy button of verify link did not work. ( #8938 )  
							
							
							
						 
						
							2018-10-09 19:36:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ad0f37e924 
								
							 
						 
						
							
							
								
								Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )  
							
							
							
						 
						
							2018-10-09 19:35:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f9fc7d7660 
								
							 
						 
						
							
							
								
								Fix CW icon color in local-settings modal  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d21c9f08e5 
								
							 
						 
						
							
							
								
								Define some local-settings hints  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c40ba63f42 
								
							 
						 
						
							
							
								
								Add support for hints (or extended descriptions) in local-settings pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c598692cdf 
								
							 
						 
						
							
							
								
								When screen width is too narrow, hide local-settings page text, keep only icons  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								56773bc55c 
								
							 
						 
						
							
							
								
								Change “preferences” icon to match settings page icon  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								065a19b18b 
								
							 
						 
						
							
							
								
								Add icons for each of the local-setting pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								02422158ae 
								
							 
						 
						
							
							
								
								Merge pull request  #774  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-09 13:23:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								4580979e28 
								
							 
						 
						
							
							
								
								Bump faker from 1.8.7 to 1.9.1 ( #8935 )  
							
							... 
							
							
							
							Bumps [faker](https://github.com/stympy/faker ) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-09 19:59:34 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								dbaded7ed2 
								
							 
						 
						
							
							
								
								Bump memory_profiler from 0.9.11 to 0.9.12 ( #8937 )  
							
							... 
							
							
							
							Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases )
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-09 19:39:46 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f09150f2a9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-09 12:12:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d73c1df33b 
								
							 
						 
						
							
							
								
								Merge pull request  #770  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-09 12:11:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e968dcea13 
								
							 
						 
						
							
							
								
								Fix app-wide hotkeys randomly failing to work  
							
							
							
						 
						
							2018-10-09 12:10:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sascha 
								
							 
						 
						
							
							
							
							
								
							
							
								b7a337f63c 
								
							 
						 
						
							
							
								
								add ffmpeg initializer ( #8855 )  
							
							... 
							
							
							
							* add ffmpeg initializer
* use different expression to check for environment var 
							
						 
						
							2018-10-09 03:02:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								bcb43baf50 
								
							 
						 
						
							
							
								
								Add Japanese translations. ( #8927 )  
							
							
							
						 
						
							2018-10-09 07:12:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								683608dd60 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 15:34:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								96a313d02b 
								
							 
						 
						
							
							
								
								Fixed error occurrence when pinning the DM column. ( #8922 )  
							
							
							
						 
						
							2018-10-08 14:43:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								74e411f4e8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 13:51:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3f68e9ed11 
								
							 
						 
						
							
							
								
								Move “Show action buttons in collapsed toots” option  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								caa56b01a9 
								
							 
						 
						
							
							
								
								Switch from selects to radio buttons for local settings, improve styling  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								e303c0730f 
								
							 
						 
						
							
							
								
								Bump capybara from 3.8.2 to 3.9.0 ( #8924 )  
							
							... 
							
							
							
							Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-08 07:45:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								7e089b5a31 
								
							 
						 
						
							
							
								
								Bump tty-prompt from 0.17.0 to 0.17.1 ( #8925 )  
							
							... 
							
							
							
							Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-08 07:45:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								63581a9262 
								
							 
						 
						
							
							
								
								Bump aws-sdk-s3 from 1.20.0 to 1.21.0 ( #8926 )  
							
							... 
							
							
							
							Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-08 07:44:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								098012ab39 
								
							 
						 
						
							
							
								
								Bump i18n-tasks from 0.9.21 to 0.9.25 ( #8923 )  
							
							... 
							
							
							
							Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.21 to 0.9.25.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.21...v0.9.25 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-08 14:24:07 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashleyhull-versent 
								
							 
						 
						
							
							
							
							
								
							
							
								00d31a292c 
								
							 
						 
						
							
							
								
								rubocop issues - Cleaning up ( #8912 )  
							
							... 
							
							
							
							* cleanup pass
* undo mistakes
* fixed.
* revert 
							
						 
						
							2018-10-08 04:50:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								65d1a2d10a 
								
							 
						 
						
							
							
								
								Remove dead code ( #8919 )  
							
							... 
							
							
							
							SignatureVerification#matches_time_window? is not called anywhere. 
							
						 
						
							2018-10-08 04:48:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashleyhull-versent 
								
							 
						 
						
							
							
							
							
								
							
							
								ea57aca5e1 
								
							 
						 
						
							
							
								
								Replace SVG asset with Custom mascot ( #8766 )  
							
							
							
						 
						
							2018-10-08 00:20:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c9b5168ebd 
								
							 
						 
						
							
							
								
								Add conversations API ( #8832 )  
							
							... 
							
							
							
							* Add conversations API
* Add web UI for conversations
* Add test for conversations API
* Add tests for ConversationAccount
* Improve web UI
* Rename ConversationAccount to AccountConversation
* Remove conversations on block and mute
* Change last_status_id to be a denormalization of status_ids
* Add optimistic locking 
							
						 
						
							2018-10-07 23:44:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								58cbb9ef8f 
								
							 
						 
						
							
							
								
								[Glitch] Change documentation URL  
							
							... 
							
							
							
							Port 7635a136c9 
							
						 
						
							2018-10-07 22:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								52f97080e7 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix margins of public-account-header__tabs  
							
							... 
							
							
							
							Port e2065ceead 
							
						 
						
							2018-10-07 22:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c8690cc917 
								
							 
						 
						
							
							
								
								Merge pull request  #768  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-07 20:13:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bdbbbb1bdb 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-07 19:47:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								8b48543b77 
								
							 
						 
						
							
							
								
								Ensure only toots from the reported users are reported ( #8916 )  
							
							
							
						 
						
							2018-10-07 19:45:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								95d977e51e 
								
							 
						 
						
							
							
								
								Add POST /api/v1/notifications/:id/dismiss ( #8905 )  
							
							... 
							
							
							
							POST /api/v1/notifications/dismiss was a mistake in #2251  
							
						 
						
							2018-10-07 18:26:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b4bab7eb35 
								
							 
						 
						
							
							
								
								Do not scroll timelines when *closing* media modals  
							
							... 
							
							
							
							Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases. 
							
						 
						
							2018-10-07 12:08:32 +02:00