D Anzorge 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29f5353f8b 
								
							 
						 
						
							
							
								
								Update Twemoji to 12.1.5 ( #13021 )  
							
							... 
							
							
							
							* Update Twemoji to 12.1.5
SVGs from Twemoji repo https://github.com/twitter/twemoji 
* Update emoji_map.json to Unicode 12 
							
						 
						
							2020-04-19 23:38:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c7128c7f0 
								
							 
						 
						
							
							
								
								Add local only to hashtag timeline ( #13502 )  
							
							
							
						 
						
							2020-04-18 21:52:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d5530827c9 
								
							 
						 
						
							
							
								
								Merge pull request  #1319  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-04-18 16:22:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								bf9da1e734 
								
							 
						 
						
							
							
								
								[Glitch] Fix uploaded image orientation in some browsers  
							
							... 
							
							
							
							Port a1ce9cbb67 
							
						 
						
							2020-04-18 15:48:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0cbc24e3b6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-18 15:47:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a1ce9cbb67 
								
							 
						 
						
							
							
								
								Fix uploaded image orientation in some browsers ( #13493 )  
							
							... 
							
							
							
							Some browsers (at least recent Chrome versions) automatically take
image metadata into account when drawing images into a canvas.
There seem to be no way to prevent that behavior, and the only
way to detect it seems to compare with a known image.
See: https://github.com/w3c/csswg-drafts/issues/4666 
Solution adapted from: 1e4df70782 
							
						 
						
							2020-04-18 15:37:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62e65dca11 
								
							 
						 
						
							
							
								
								Merge pull request  #1318  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-04-17 22:36:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								81ef26b67d 
								
							 
						 
						
							
							
								
								[Glitch] Fix not being able to vote  
							
							... 
							
							
							
							Port e12a5635da 
							
						 
						
							2020-04-17 22:04:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7ee65ba15e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-17 22:02:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e12a5635da 
								
							 
						 
						
							
							
								
								Fix not being able to vote ( #13490 )  
							
							... 
							
							
							
							Fix regression introduced by ab8d7c0680 
							
						 
						
							2020-04-17 21:54:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gurgen Hayrapetyan 
								
							 
						 
						
							
							
							
							
								
							
							
								4849752a9c 
								
							 
						 
						
							
							
								
								[Glitch] Fix Poll fetchPoll action not being debounced.  
							
							... 
							
							
							
							Port ab8d7c0680 
							
						 
						
							2020-04-17 20:20:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								81e49ba5c6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-17 20:16:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								89077fb657 
								
							 
						 
						
							
							
								
								Fix admin actions log crash when displaying updates of deleted announcements ( #13489 )  
							
							... 
							
							
							
							Fixes  #13487  
						
							2020-04-17 19:54:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d18d6c29f3 
								
							 
						 
						
							
							
								
								Fix search not working due to proxy settings when using hidden services ( #13488 )  
							
							... 
							
							
							
							Fix  #13484  
						
							2020-04-17 15:14:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gurgen Hayrapetyan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab8d7c0680 
								
							 
						 
						
							
							
								
								Fix Poll fetchPoll action not being debounced. ( #13485 )  
							
							... 
							
							
							
							* Fix Poll fetchPoll action not being debounced.
* Fix unused import in the Poll component 
							
						 
						
							2020-04-16 20:16:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								04c8d825f6 
								
							 
						 
						
							
							
								
								Fix DeliveryWorker not to call failure_tracker when inbox_url is unavailable ( #13482 )  
							
							
							
						 
						
							2020-04-16 08:04:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea200a178e 
								
							 
						 
						
							
							
								
								Fix migration 20200407202420_migrate_unavailable_inboxes ( #13481 )  
							
							
							
						 
						
							2020-04-16 08:03:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3825e1943f 
								
							 
						 
						
							
							
								
								Fix confusing error when failing to add an alias to an unknown account ( #13480 )  
							
							... 
							
							
							
							Follow-up to #13452 , fixing broken `uri.nil?` test.
Also remove the separate check for `uri` presence, as that would result
in a “Please review 2 errors below” while only one would be listed. 
							
						 
						
							2020-04-15 20:33:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5edff32733 
								
							 
						 
						
							
							
								
								Change delivery failure tracking to work with hostnames instead of URLs ( #13437 )  
							
							
							
						 
						
							2020-04-15 20:33:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5fdd5eef5a 
								
							 
						 
						
							
							
								
								Merge pull request  #1317  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-04-15 18:24:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								66ad30db48 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
- `yarn.lock`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it. 
							
						 
						
							2020-04-15 17:07:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5524258da9 
								
							 
						 
						
							
							
								
								Fix “Email changed” notification sometimes having wrong e-mail ( #13475 )  
							
							... 
							
							
							
							* Fix “Email changed” notification sometimes having wrong e-mail
Fixes  #6778 
The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.
Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
  In that case, `changed?` is false and `saved_changes?` is true, so
  if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
  notification.
  In that case, `changed?` is still false, and `saved_changes?` still true,
  so if we use the latter, that second notification email is simply not
  going to be sent (as we would be queuing the notification *after*
  executing the after_commit hook).
This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.
The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.
[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification 
[2]: 406915cb78/lib/devise/models/authenticatable.rb (L133-L194) 
							
						 
						
							2020-04-15 16:13:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80c04b2819 
								
							 
						 
						
							
							
								
								Bump watchpack from 1.6.0 to 1.6.1 ( #13462 )  
							
							... 
							
							
							
							Bumps [watchpack](https://github.com/webpack/watchpack ) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/webpack/watchpack/releases )
- [Commits](https://github.com/webpack/watchpack/compare/v1.6.0...v1.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-14 00:35:20 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								516bdc66ba 
								
							 
						 
						
							
							
								
								Bump regexp_parser from 1.6.0 to 1.7.0 ( #13460 )  
							
							... 
							
							
							
							Bumps [regexp_parser](https://github.com/ammar/regexp_parser ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ammar/regexp_parser/releases )
- [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ammar/regexp_parser/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:40:22 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1170073a67 
								
							 
						 
						
							
							
								
								Bump rubocop-rails from 2.4.2 to 2.5.2 ( #13459 )  
							
							... 
							
							
							
							Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:36:57 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00df65df77 
								
							 
						 
						
							
							
								
								Bump capistrano from 3.12.1 to 3.13.0 ( #13455 )  
							
							... 
							
							
							
							Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.12.1 to 3.13.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.12.1...v3.13.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:33:53 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bf421bbc65 
								
							 
						 
						
							
							
								
								Bump elasticsearch from 7.5.0 to 7.6.0 ( #13458 )  
							
							... 
							
							
							
							Bumps [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby ) from 7.5.0 to 7.6.0.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/v7.6.0/CHANGELOG.md )
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v7.5.0...v7.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:21:31 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2fa1b2626 
								
							 
						 
						
							
							
								
								Bump cssom from 0.3.4 to 0.3.8 ( #13461 )  
							
							... 
							
							
							
							Bumps [cssom](https://github.com/NV/CSSOM ) from 0.3.4 to 0.3.8.
- [Release notes](https://github.com/NV/CSSOM/releases )
- [Commits](https://github.com/NV/CSSOM/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:20:30 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22d8d1e178 
								
							 
						 
						
							
							
								
								Bump regexp.prototype.flags from 1.2.0 to 1.3.0 ( #13468 )  
							
							... 
							
							
							
							Bumps [regexp.prototype.flags](https://github.com/es-shims/RegExp.prototype.flags ) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/es-shims/RegExp.prototype.flags/releases )
- [Changelog](https://github.com/es-shims/RegExp.prototype.flags/blob/master/CHANGELOG.md )
- [Commits](https://github.com/es-shims/RegExp.prototype.flags/compare/v1.2.0...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:18:01 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d80a7366e4 
								
							 
						 
						
							
							
								
								Bump fabrication from 2.21.0 to 2.21.1 ( #13453 )  
							
							... 
							
							
							
							Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.21.0 to 2.21.1.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/compare/2.21.0...2.21.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:16:40 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16443975f5 
								
							 
						 
						
							
							
								
								Bump aws-sdk-s3 from 1.61.1 to 1.61.2 ( #13456 )  
							
							... 
							
							
							
							Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.61.1 to 1.61.2.
- [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-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:16:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e357c771ac 
								
							 
						 
						
							
							
								
								Bump mousetrap from 1.6.2 to 1.6.5 ( #13466 )  
							
							... 
							
							
							
							Bumps [mousetrap](https://github.com/ccampbell/mousetrap ) from 1.6.2 to 1.6.5.
- [Release notes](https://github.com/ccampbell/mousetrap/releases )
- [Commits](https://github.com/ccampbell/mousetrap/compare/1.6.2...1.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:14:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c067089c25 
								
							 
						 
						
							
							
								
								Bump mkdirp from 1.0.3 to 1.0.4 ( #13463 )  
							
							... 
							
							
							
							Bumps [mkdirp](https://github.com/isaacs/node-mkdirp ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases )
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/isaacs/node-mkdirp/compare/v1.0.3...v1.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:11:52 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								13e73dc9eb 
								
							 
						 
						
							
							
								
								Bump unicode-match-property-value-ecmascript from 1.1.0 to 1.2.0 ( #13464 )  
							
							... 
							
							
							
							Bumps [unicode-match-property-value-ecmascript](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript/releases )
- [Commits](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript/compare/v1.1.0...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:09:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								267375a8a2 
								
							 
						 
						
							
							
								
								Bump picomatch from 2.0.7 to 2.2.2 ( #13465 )  
							
							... 
							
							
							
							Bumps [picomatch](https://github.com/micromatch/picomatch ) from 2.0.7 to 2.2.2.
- [Release notes](https://github.com/micromatch/picomatch/releases )
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md )
- [Commits](https://github.com/micromatch/picomatch/compare/2.0.7...2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:08:13 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bbd4361ffa 
								
							 
						 
						
							
							
								
								Bump autoprefixer from 9.7.5 to 9.7.6 ( #13467 )  
							
							... 
							
							
							
							Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.7.5 to 9.7.6.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.5...9.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:06:14 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0fc6ce7788 
								
							 
						 
						
							
							
								
								Bump htmlparser2 from 3.10.0 to 3.10.1 ( #13469 )  
							
							... 
							
							
							
							Bumps [htmlparser2](https://github.com/fb55/htmlparser2 ) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/fb55/htmlparser2/releases )
- [Commits](https://github.com/fb55/htmlparser2/compare/v3.10.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-13 23:04:15 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f7e011919e 
								
							 
						 
						
							
							
								
								Fix account aliases page ( #13452 )  
							
							... 
							
							
							
							* Fix error not being displayed when adding an account alias, add error for self-references
Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
* Add “You have no aliases.” note in confusing empty aliases table
Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
Co-authored-by: Mélanie Chauvel (ariasuni) <perso@hack-libre.org> 
							
						 
						
							2020-04-13 06:41:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								615073df33 
								
							 
						 
						
							
							
								
								Merge pull request  #1316  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-04-12 17:58:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a08a2130f0 
								
							 
						 
						
							
							
								
								[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists  
							
							... 
							
							
							
							Port ec31b1b752 
							
						 
						
							2020-04-12 17:01:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								fdd0beefa7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours. 
							
						 
						
							2020-04-12 16:50:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Ľach 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								490ff09c5a 
								
							 
						 
						
							
							
								
								increase the postgres container shm_size from 64mb to 256mb ( #13451 )  
							
							
							
						 
						
							2020-04-12 16:41:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Leonie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f6c18e8829 
								
							 
						 
						
							
							
								
								Fix API footer link in Web UI ( #13441 )  
							
							... 
							
							
							
							Co-authored-by: koyu <me@koyu.spac> 
							
						 
						
							2020-04-12 13:38:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ec31b1b752 
								
							 
						 
						
							
							
								
								Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists ( #13445 )  
							
							... 
							
							
							
							* Fix following, followers and follow requests pagination
* Fix pagination of blocks and mutes 
							
						 
						
							2020-04-12 13:38:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fuyu 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e51cbbbf5b 
								
							 
						 
						
							
							
								
								Add new vagrant log files to .gitignore ( #13442 )  
							
							... 
							
							
							
							* Update .gitignore
* Update .gitignore
Co-Authored-By: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com> 
							
						 
						
							2020-04-12 13:37:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								51bbf0b68d 
								
							 
						 
						
							
							
								
								Clean up some dead code  
							
							
							
						 
						
							2020-04-10 14:47:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								44a19fd96d 
								
							 
						 
						
							
							
								
								Fix translation platform to Crowdin ( #13443 )  
							
							
							
						 
						
							2020-04-10 08:24:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f24ee2484b 
								
							 
						 
						
							
							
								
								Bump capistrano-bundler from 1.3.0 to 1.6.0 ( #13416 )  
							
							... 
							
							
							
							Bumps [capistrano-bundler](https://github.com/capistrano/bundler ) from 1.3.0 to 1.6.0.
- [Release notes](https://github.com/capistrano/bundler/releases )
- [Changelog](https://github.com/capistrano/bundler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/bundler/compare/v1.3.0...v1.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-10 03:34:54 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7faf5e7385 
								
							 
						 
						
							
							
								
								Bump elasticsearch-dsl from 0.1.8 to 0.1.9 ( #13419 )  
							
							... 
							
							
							
							Bumps [elasticsearch-dsl](https://github.com/elasticsearch/elasticsearch-ruby ) from 0.1.8 to 0.1.9.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v0.1.8...v0.1.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-10 03:33:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								42389bda80 
								
							 
						 
						
							
							
								
								Bump annotate from 3.0.3 to 3.1.1 ( #13417 )  
							
							... 
							
							
							
							Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.0.3 to 3.1.1.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.3...v3.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
							
						 
						
							2020-04-10 03:32:39 +09:00