dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								fc1de6a1e9 
								
							 
						 
						
							
							
								
								Bump acorn-walk from 7.1.1 to 7.2.0 ( #14077 )  
							
							... 
							
							
							
							Bumps [acorn-walk](https://github.com/acornjs/acorn ) from 7.1.1 to 7.2.0.
- [Release notes](https://github.com/acornjs/acorn/releases )
- [Commits](https://github.com/acornjs/acorn/compare/7.1.1...7.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:31:03 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								b75859cdf4 
								
							 
						 
						
							
							
								
								Bump loofah from 2.5.0 to 2.6.0 ( #14071 )  
							
							... 
							
							
							
							Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.5.0...v2.6.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:27:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								f89918bb93 
								
							 
						 
						
							
							
								
								Bump rdf from 3.1.2 to 3.1.3 ( #14070 )  
							
							... 
							
							
							
							Bumps [rdf](https://github.com/ruby-rdf/rdf ) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/ruby-rdf/rdf/releases )
- [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md )
- [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.2...3.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:27:10 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								9a91ef76ea 
								
							 
						 
						
							
							
								
								Bump eslint-plugin-jsx-a11y from 6.2.3 to 6.3.1 ( #14114 )  
							
							... 
							
							
							
							Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y ) from 6.2.3 to 6.3.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases )
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md )
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.3...v6.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:24:15 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								413842d0af 
								
							 
						 
						
							
							
								
								Bump parser from 2.7.1.3 to 2.7.1.4 ( #14101 )  
							
							... 
							
							
							
							Bumps [parser](https://github.com/whitequark/parser ) from 2.7.1.3 to 2.7.1.4.
- [Release notes](https://github.com/whitequark/parser/releases )
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.3...v2.7.1.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:22:53 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								ac526afe60 
								
							 
						 
						
							
							
								
								Bump aws-partitions from 1.329.0 to 1.332.0 ( #14110 )  
							
							... 
							
							
							
							Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.329.0 to 1.332.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:22:35 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								df89562e57 
								
							 
						 
						
							
							
								
								Bump fast-deep-equal from 3.1.1 to 3.1.3 ( #14111 )  
							
							... 
							
							
							
							Bumps [fast-deep-equal](https://github.com/epoberezkin/fast-deep-equal ) from 3.1.1 to 3.1.3.
- [Release notes](https://github.com/epoberezkin/fast-deep-equal/releases )
- [Commits](https://github.com/epoberezkin/fast-deep-equal/compare/v3.1.1...v3.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:21:06 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								4dc95e80dc 
								
							 
						 
						
							
							
								
								Bump @babel/core from 7.10.2 to 7.10.3 ( #14112 )  
							
							... 
							
							
							
							Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.10.2 to 7.10.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:19:30 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								62013a1c36 
								
							 
						 
						
							
							
								
								Bump elliptic from 6.5.2 to 6.5.3 ( #14115 )  
							
							... 
							
							
							
							Bumps [elliptic](https://github.com/indutny/elliptic ) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases )
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:16:59 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								140e78f3d3 
								
							 
						 
						
							
							
								
								Bump es-abstract from 1.17.5 to 1.17.6 ( #14117 )  
							
							... 
							
							
							
							Bumps [es-abstract](https://github.com/ljharb/es-abstract ) from 1.17.5 to 1.17.6.
- [Release notes](https://github.com/ljharb/es-abstract/releases )
- [Changelog](https://github.com/ljharb/es-abstract/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ljharb/es-abstract/compare/v1.17.5...v1.17.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-25 17:13:54 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								12ac904a33 
								
							 
						 
						
							
							
								
								Fix various issues around OpenGraph representation of media ( #14133 )  
							
							... 
							
							
							
							- Fix audio attachments not being represented in OpenGraph tags
- Fix audio being represented as "1 image" in OpenGraph descriptions
- Fix video metadata being overwritten by paperclip-av-transcoder
- Fix embedded player not using Mastodon's UI
- Fix audio/video progress bars not moving smoothly
- Fix audio/video buffered bars not displaying correctly 
							
						 
						
							2020-06-25 01:33:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1fcf4d65d5 
								
							 
						 
						
							
							
								
								Remove unused dependency on wavesurfer.js ( #14136 )  
							
							... 
							
							
							
							It's not used anymore now that the audio player design has changed again. 
							
						 
						
							2020-06-24 22:54:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e303673059 
								
							 
						 
						
							
							
								
								Change streaming server to treat blank redis password as password-less auth ( #14135 )  
							
							... 
							
							
							
							Fixes  #14131 
Our `mastodon:setup` task defaults to a blank password rather than the
absence of password, but some versions of Redis reject blank password
authentication when authentication is possible without a password.
The Ruby code only uses the Redis password when it's not blank, so
do the same for the node.js part. 
						
							2020-06-24 22:25:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								723c73c3f2 
								
							 
						 
						
							
							
								
								Merge pull request  #1361  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-06-24 17:06:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c0ad588857 
								
							 
						 
						
							
							
								
								[Glitch] Fix very wide media attachments resulting in too thin a thumbnail  
							
							... 
							
							
							
							Port 90445230cd 
							
						 
						
							2020-06-24 16:01:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								26778b8c30 
								
							 
						 
						
							
							
								
								[Glitch] Fix modifier key to keep the EmojiPicker on macOS  
							
							... 
							
							
							
							Port c0b52ac871 
							
						 
						
							2020-06-24 15:56:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fuyu 
								
							 
						 
						
							
							
							
							
								
							
							
								2e48c4ae55 
								
							 
						 
						
							
							
								
								[Glitch] Fix unnecessary gap under of video modal  
							
							... 
							
							
							
							Port 88cbcb5804 
							
						 
						
							2020-06-24 15:55:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c1eb60642b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes. 
							
						 
						
							2020-06-24 15:33:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d0dc37eadb 
								
							 
						 
						
							
							
								
								Fix audio/video/images/cards not reacting to window resizes in web UI ( #14130 )  
							
							... 
							
							
							
							* Fix audio/video/images/cards not reacting to window resizes in web UI
* Update app/javascript/mastodon/features/audio/index.js
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-06-24 10:25:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								90445230cd 
								
							 
						 
						
							
							
								
								Fix very wide media attachments resulting in too thin a thumbnail ( #14127 )  
							
							... 
							
							
							
							Fixes  #14094  
						
							2020-06-23 17:24:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								df13142cdd 
								
							 
						 
						
							
							
								
								Fix crash in MergeWorker ( #14129 )  
							
							... 
							
							
							
							Similarly to #12324 , the code is passing an Account object where an id
is expected. 
							
						 
						
							2020-06-23 16:40:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a6ce37528e 
								
							 
						 
						
							
							
								
								Simplify filtering condition  
							
							
							
						 
						
							2020-06-23 16:09:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ash lea 
								
							 
						 
						
							
							
							
							
								
							
							
								3489cb87b7 
								
							 
						 
						
							
							
								
								never filter own posts from timeline  
							
							
							
						 
						
							2020-06-23 16:09:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6c42b23382 
								
							 
						 
						
							
							
								
								never filter own posts from timeline ( #14128 )  
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Co-authored-by: ash lea <example@thisismyactual.email> 
							
						 
						
							2020-06-23 16:01:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ce34c13aff 
								
							 
						 
						
							
							
								
								Change volume control and download buttons in web UI ( #14122 )  
							
							... 
							
							
							
							* Fix audio download button not starting download in web UI
* Fix volume controls on audio and video players in web UI
* Remove download button from video player in web UI 
							
						 
						
							2020-06-23 12:20:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								90477d7e4d 
								
							 
						 
						
							
							
								
								Fix audio player not working when media files are hosted on a different domain ( #14118 )  
							
							
							
						 
						
							2020-06-22 19:24:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6d4a71856b 
								
							 
						 
						
							
							
								
								Fix unique username constraint for local users not being enforced in database ( #14099 )  
							
							... 
							
							
							
							This should not be an issue in practice because of the Rails-level uniqueness
check, but local accounts having a NULL domain means the uniqueness constraint
did not apply to them (since no two NULL values are considered equal). 
							
						 
						
							2020-06-21 12:41:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								563a77d0b4 
								
							 
						 
						
							
							
								
								Change design of audio players in web UI ( #14095 )  
							
							
							
						 
						
							2020-06-21 02:27:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								e72d60ed6d 
								
							 
						 
						
							
							
								
								Bump eslint-import-resolver-node from 0.3.3 to 0.3.4 ( #14081 )  
							
							... 
							
							
							
							Bumps [eslint-import-resolver-node](https://github.com/benmosher/eslint-plugin-import ) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/resolvers/node/v0.3.3...resolvers/node/v0.3.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-21 08:32:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								571ca9cd56 
								
							 
						 
						
							
							
								
								Bump fast-glob from 3.2.2 to 3.2.4 ( #14079 )  
							
							... 
							
							
							
							Bumps [fast-glob](https://github.com/mrmlnc/fast-glob ) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/mrmlnc/fast-glob/releases )
- [Commits](https://github.com/mrmlnc/fast-glob/compare/3.2.2...3.2.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-21 08:32:02 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								3f187b6260 
								
							 
						 
						
							
							
								
								Bump sass from 1.26.5 to 1.26.8 ( #14078 )  
							
							... 
							
							
							
							Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.5 to 1.26.8.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.26.5...1.26.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-21 08:30:09 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								0072b00e3c 
								
							 
						 
						
							
							
								
								Bump aws-sdk-core from 3.99.2 to 3.100.0 ( #14072 )  
							
							... 
							
							
							
							Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby ) from 3.99.2 to 3.100.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-21 08:28:45 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								71f92170d8 
								
							 
						 
						
							
							
								
								Bump nearley from 2.19.3 to 2.19.4 ( #14075 )  
							
							... 
							
							
							
							Bumps [nearley](https://github.com/hardmath123/nearley ) from 2.19.3 to 2.19.4.
- [Release notes](https://github.com/hardmath123/nearley/releases )
- [Commits](https://github.com/hardmath123/nearley/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-21 08:27:50 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								c6f474c0c4 
								
							 
						 
						
							
							
								
								Bump electron-to-chromium from 1.3.448 to 1.3.475 ( #14068 )  
							
							... 
							
							
							
							Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium ) from 1.3.448 to 1.3.475.
- [Release notes](https://github.com/kilian/electron-to-chromium/releases )
- [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.448...v1.3.475 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-21 08:26:21 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								8c169b2a7a 
								
							 
						 
						
							
							
								
								Bump caniuse-lite from 1.0.30001078 to 1.0.30001084 ( #14083 )  
							
							... 
							
							
							
							Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite ) from 1.0.30001078 to 1.0.30001084.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases )
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001078...v1.0.30001084 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-21 08:25:05 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								c0b52ac871 
								
							 
						 
						
							
							
								
								Fix modifier key to keep the EmojiPicker on macOS ( #14096 )  
							
							
							
						 
						
							2020-06-20 13:30:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fuyu 
								
							 
						 
						
							
							
							
							
								
							
							
								88cbcb5804 
								
							 
						 
						
							
							
								
								Fix unnecessary gap under of video modal ( #14098 )  
							
							
							
						 
						
							2020-06-20 13:30:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fuyu 
								
							 
						 
						
							
							
							
							
								
							
							
								ad1dfea4fa 
								
							 
						 
						
							
							
								
								Fix not working I18n on 2FA and Sign in token page ( #14087 )  
							
							
							
						 
						
							2020-06-20 13:30:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6a3e2b0fe5 
								
							 
						 
						
							
							
								
								Fix functional user requirements in whitelist mode ( #14093 )  
							
							... 
							
							
							
							Fixes  #14092  
						
							2020-06-19 19:18:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								86106b90c9 
								
							 
						 
						
							
							
								
								Merge pull request  #1358  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-06-17 18:28:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aeba0f513d 
								
							 
						 
						
							
							
								
								[Glitch] Add hints about incomplete remote content to web UI  
							
							... 
							
							
							
							Port 32b7d341b7 
							
						 
						
							2020-06-17 17:48:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								743cef53d8 
								
							 
						 
						
							
							
								
								[Glitch] Fix initial audio volume not corresponding to what's displayed  
							
							... 
							
							
							
							Port 3f5fa64211 
							
						 
						
							2020-06-17 17:20:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fuyu 
								
							 
						 
						
							
							
							
							
								
							
							
								14272c3a0e 
								
							 
						 
						
							
							
								
								[Glitch] Fixed emoji detection problem to append border  
							
							... 
							
							
							
							Port 4a3af0386b 
							
						 
						
							2020-06-17 17:18:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4d5ff62de5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency 
							
						 
						
							2020-06-17 17:10:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								fcf3fcc3c5 
								
							 
						 
						
							
							
								
								Bump parallel from 1.19.1 to 1.19.2 ( #14069 )  
							
							... 
							
							
							
							Bumps [parallel](https://github.com/grosser/parallel ) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.19.1...v1.19.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-17 20:18:43 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								db856552ce 
								
							 
						 
						
							
							
								
								Suppress Redis#exists(key) warning ( #14067 )  
							
							
							
						 
						
							2020-06-17 10:31:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								4aca523d14 
								
							 
						 
						
							
							
								
								Bump capistrano from 3.14.0 to 3.14.1 ( #14037 )  
							
							... 
							
							
							
							* Bump capistrano from 3.14.0 to 3.14.1
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.14.0 to 3.14.1.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.14.0...v3.14.1 )
Signed-off-by: dependabot[bot] <support@github.com>
* Bump capistrano from 3.14.0 to 3.14.1
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-06-17 06:31:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								759ad1511b 
								
							 
						 
						
							
							
								
								[Security] Bump rack from 2.2.2 to 2.2.3 ( #14064 )  
							
							
							
						 
						
							2020-06-17 06:30:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								42df10e681 
								
							 
						 
						
							
							
								
								Bump sanitize from 5.2.0 to 5.2.1 ( #14063 )  
							
							... 
							
							
							
							Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.2.0...v5.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-17 10:15:54 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								01a4c7844c 
								
							 
						 
						
							
							
								
								Bump parallel_tests from 2.32.0 to 3.0.0 ( #14044 )  
							
							... 
							
							
							
							Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.32.0 to 3.0.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.32.0...v3.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-16 01:00:56 +09:00