João Pedro Marques 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f6e290c7a 
								
							 
						 
						
							
							
								
								Adds new follower/following routes ( #24601 )  
							
							
							
						 
						
							2023-04-30 09:01:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0669822ae8 
								
							 
						 
						
							
							
								
								Bump eslint from 8.38.0 to 8.39.0 ( #24636 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-30 16:01:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								242d7864f1 
								
							 
						 
						
							
							
								
								Bump @types/jest from 29.4.2 to 29.5.1 ( #24630 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-30 16:00:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								56cf092058 
								
							 
						 
						
							
							
								
								Bump @types/yargs from 17.0.22 to 17.0.24 ( #24388 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-30 15:46:03 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fa14976a5d 
								
							 
						 
						
							
							
								
								Bump connection_pool from 2.3.0 to 2.4.0 ( #24290 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-04-30 15:45:02 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								819daeb651 
								
							 
						 
						
							
							
								
								Bump @types/lodash from 4.14.191 to 4.14.194 ( #24576 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-30 15:39:49 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								921bef6799 
								
							 
						 
						
							
							
								
								Bump stylelint from 15.3.0 to 15.6.0 ( #24635 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-30 15:38:53 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e8fe941015 
								
							 
						 
						
							
							
								
								Fix  tootctl accounts approve --number N not aproving N earliest registrations ( #24605 )  
							
							
							
						 
						
							2023-04-30 06:50:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e43461100 
								
							 
						 
						
							
							
								
								Fix Rails/Output cop ( #24687 )  
							
							
							
						 
						
							2023-04-30 06:48:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a2aa06a51 
								
							 
						 
						
							
							
								
								Fix Rails/Present cop ( #24688 )  
							
							
							
						 
						
							2023-04-30 06:47:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bdc74086e6 
								
							 
						 
						
							
							
								
								Fix Rails/ContentTag cop ( #24691 )  
							
							
							
						 
						
							2023-04-30 06:47:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e226f5a32 
								
							 
						 
						
							
							
								
								Fix Rails/ActionOrder cop ( #24692 )  
							
							
							
						 
						
							2023-04-30 06:46:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								470b8abb69 
								
							 
						 
						
							
							
								
								Run Rubocop with lint-staged on commit ( #24644 )  
							
							
							
						 
						
							2023-04-30 06:46:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								60ac9e8634 
								
							 
						 
						
							
							
								
								Fix Rails/SquishedSQLHeredocs cop ( #24694 )  
							
							
							
						 
						
							2023-04-30 06:43:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8dcfb6e0ea 
								
							 
						 
						
							
							
								
								Fix Rails/HttpPositionalArguments cop ( #24699 )  
							
							
							
						 
						
							2023-04-30 06:43:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								678d836c7d 
								
							 
						 
						
							
							
								
								Fix pop-in player placeholder layout in thread view ( #24715 )  
							
							
							
						 
						
							2023-04-30 06:42:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf1bc4bb93 
								
							 
						 
						
							
							
								
								Fix audio player width in thread view ( #24713 )  
							
							
							
						 
						
							2023-04-30 06:42:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f22b4e556c 
								
							 
						 
						
							
							
								
								Add eslint-plugin-jsdoc ( #24719 )  
							
							
							
						 
						
							2023-04-30 02:29:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bfeccf6748 
								
							 
						 
						
							
							
								
								Fix media description not being cleared ( #24720 )  
							
							
							
						 
						
							2023-04-30 02:29:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								274d561430 
								
							 
						 
						
							
							
								
								Enable local account key generation spec ( #24728 )  
							
							
							
						 
						
							2023-04-30 02:28:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0d075713f 
								
							 
						 
						
							
							
								
								Change i18n-fallbacks to English ( #24727 )  
							
							
							
						 
						
							2023-04-30 02:22:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4cfe52635c 
								
							 
						 
						
							
							
								
								Add pending spec for User.those_who_can ( #24724 )  
							
							
							
						 
						
							2023-04-29 22:03:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								e79998a11a 
								
							 
						 
						
							
							
								
								Restore translations from not-yet-ported onboarding changes as glitch-soc translations  
							
							
							
						 
						
							2023-04-29 19:38:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								38eeed6cbf 
								
							 
						 
						
							
							
								
								[Glitch] Change logo version in header based on screen size in web UI  
							
							... 
							
							
							
							Port 6028d047b9 
							
						 
						
							2023-04-29 18:54:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								1033598416 
								
							 
						 
						
							
							
								
								[Glitch] Enable formatjs/prefer-pound-in-plural  
							
							... 
							
							
							
							Port 2daa5a1549 
							
						 
						
							2023-04-29 18:38:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								edec08b970 
								
							 
						 
						
							
							
								
								Disable full-width media in thread view  
							
							
							
						 
						
							2023-04-29 12:43:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								cb97a92954 
								
							 
						 
						
							
							
								
								[Glitch] Fix thread lines in right-to-left locales ( #24714 )  
							
							... 
							
							
							
							Port 105f8687e4 
							
						 
						
							2023-04-29 12:21:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								103b6de8b2 
								
							 
						 
						
							
							
								
								[Glitch] Fix sass warning about deprecated slash as division ( #24653 )  
							
							... 
							
							
							
							Port 1527b02c6d 
							
						 
						
							2023-04-29 12:17:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7b01b7c3bf 
								
							 
						 
						
							
							
								
								[Glitch] Add lines to threads in web UI  
							
							... 
							
							
							
							Port 290e4aba31 
							
						 
						
							2023-04-29 12:08:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8015297f9e 
								
							 
						 
						
							
							
								
								[Glitch] Change label from "For you" to "People" on explore screen in web UI  
							
							... 
							
							
							
							Port 7cf963eec2 
							
						 
						
							2023-04-29 11:34:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chike Nwaenie 
								
							 
						 
						
							
							
							
							
								
							
							
								374a109546 
								
							 
						 
						
							
							
								
								[Glitch] Change styling of the recommended accounts to allow bio to be more visible  
							
							... 
							
							
							
							Port e1b4eeb636 
							
						 
						
							2023-04-29 11:28:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								0091b28ffe 
								
							 
						 
						
							
							
								
								[Glitch] Use CSS to trim long card descriptions  
							
							... 
							
							
							
							Port e713c545b8 
							
						 
						
							2023-04-29 11:26:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								11b34a903a 
								
							 
						 
						
							
							
								
								[Glitch] Fix infinite loop in emoji replacement code  
							
							... 
							
							
							
							Port fbb4de3dbc 
							
						 
						
							2023-04-29 11:14:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0a813d96db 
								
							 
						 
						
							
							
								
								[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)  
							
							... 
							
							
							
							Port 37886c28da 
							
						 
						
							2023-04-29 11:12:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								66bda4713e 
								
							 
						 
						
							
							
								
								[Glitch] Allow == when null checking  
							
							... 
							
							
							
							Port c1a7e38d2b 
							
						 
						
							2023-04-29 11:09:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								612a1ee697 
								
							 
						 
						
							
							
								
								Fix body_classes test for glitch-soc  
							
							
							
						 
						
							2023-04-29 11:08:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								12b935fadf 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream. 
							
						 
						
							2023-04-29 10:44:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								105f8687e4 
								
							 
						 
						
							
							
								
								Fix thread lines in right-to-left locales ( #24714 )  
							
							
							
						 
						
							2023-04-28 13:12:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2a3a110f00 
								
							 
						 
						
							
							
								
								Fix wrong classes audio and video instead of audio-player and video-player in CSS ( #24711 )  
							
							
							
						 
						
							2023-04-28 11:15:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								faa336e3f7 
								
							 
						 
						
							
							
								
								Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )  
							
							
							
						 
						
							2023-04-28 10:27:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8979b70975 
								
							 
						 
						
							
							
								
								Add default post text to onboarding flow in web UI ( #24705 )  
							
							
							
						 
						
							2023-04-28 10:05:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1c61869eed 
								
							 
						 
						
							
							
								
								Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )  
							
							
							
						 
						
							2023-04-28 10:01:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6028d047b9 
								
							 
						 
						
							
							
								
								Change logo version in header based on screen size in web UI ( #24707 )  
							
							
							
						 
						
							2023-04-28 10:00:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b0f1f365a 
								
							 
						 
						
							
							
								
								Remove display name input from sign-up form ( #24704 )  
							
							
							
						 
						
							2023-04-28 08:54:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7cf963eec2 
								
							 
						 
						
							
							
								
								Change label from "For you" to "People" on explore screen in web UI ( #24706 )  
							
							
							
						 
						
							2023-04-28 08:54:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a5bc4ea550 
								
							 
						 
						
							
							
								
								Fix refering to unused preview-card CSS class instead of status-card ( #24696 )  
							
							
							
						 
						
							2023-04-28 07:50:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ece38b9318 
								
							 
						 
						
							
							
								
								Remove duplicate react helper method definitions ( #24700 )  
							
							
							
						 
						
							2023-04-28 06:35:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8e514b1965 
								
							 
						 
						
							
							
								
								Unignore stuck Dependabot updates ( #24670 )  
							
							
							
						 
						
							2023-04-27 12:12:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9e9579832 
								
							 
						 
						
							
							
								
								Bump tesseract.js from 2.1.1 to 2.1.5 ( #19084 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-27 11:26:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1d9969fadf 
								
							 
						 
						
							
							
								
								Fix tootctl accounts create --reattach --force not working with confirmed accounts ( #24680 )  
							
							
							
						 
						
							2023-04-27 10:15:45 +02:00