Matt Jankowski 
							
						 
					 
					
						
						
							
						
						668a19a2f3 
					 
					
						
						
							
							Fix Performance/DeletePrefix cop ( #24796 )  
						
						
						
						
					 
					
						2023-05-02 21:07:45 +02:00 
						 
				 
			
				
					
						
							
							
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						8227af8dcc 
					 
					
						
						
							
							use configureStore of redux-toolkit instead of createStore of redux ( #24790 )  
						
						
						
						
					 
					
						2023-05-02 20:39:06 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						b5c4b47746 
					 
					
						
						
							
							Fix Rails/ActiveRecordCallbacksOrder cop ( #24689 )  
						
						
						
						
					 
					
						2023-05-02 18:23:35 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						38b2974a83 
					 
					
						
						
							
							Extract AccountSearch concern from Account ( #24716 )  
						
						
						
						
					 
					
						2023-05-02 18:21:36 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						f1c1dd0118 
					 
					
						
						
							
							Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method ( #24741 )  
						
						
						
						
					 
					
						2023-05-02 18:16:07 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						a7df578f97 
					 
					
						
						
							
							ApplicationHelper spec coverage, unused removal, tiny refactor ( #24762 )  
						
						
						
						
					 
					
						2023-05-02 18:10:39 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						bae694108a 
					 
					
						
						
							
							Fix Performance/Count cop ( #24793 )  
						
						
						
						
					 
					
						2023-05-02 18:06:43 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						9189e90ff2 
					 
					
						
						
							
							Add fallback redirection when getting a webfinger query LOCAL_DOMAIN@LOCAL_DOMAIN ( #23600 )  
						
						... 
						
						
						
						Co-authored-by: Eugen Rochko <eugen@zeonfederated.com > 
						
						
					 
					
						2023-05-02 17:42:42 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						5e060e1f44 
					 
					
						
						
							
							Fix Performance/Sum cop ( #24788 )  
						
						
						
						
					 
					
						2023-05-02 16:10:40 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						a89b02af92 
					 
					
						
						
							
							Check domain suspensions before trying to fetch resources ( #24535 )  
						
						
						
						
					 
					
						2023-05-02 15:22:19 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						b233da5996 
					 
					
						
						
							
							Optimize archive export service and export zip files instead of gzipped tar files ( #23360 )  
						
						
						
						
					 
					
						2023-05-02 15:09:43 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8131a5b330 
					 
					
						
						
							
							Add ALT badges to media that has alternative text in web UI ( #24782 )  
						
						
						
						
					 
					
						2023-05-02 14:47:04 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						6693a4fe7c 
					 
					
						
						
							
							Change lists to be able to include accounts with pending follow requests ( #19727 )  
						
						
						
						
					 
					
						2023-05-02 14:40:36 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						598e63dad2 
					 
					
						
						
							
							Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )  
						
						
						
						
					 
					
						2023-05-02 13:58:48 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						88d33f361f 
					 
					
						
						
							
							Fix Lint/DuplicateBranch cop ( #24766 )  
						
						
						
						
					 
					
						2023-05-02 12:57:11 +02:00 
						 
				 
			
				
					
						
							
							
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						f50105779b 
					 
					
						
						
							
							Add type annotation for Blurhash component ( #24750 )  
						
						
						
						
					 
					
						2023-05-02 12:54:00 +02:00 
						 
				 
			
				
					
						
							
							
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						5a5975d7f7 
					 
					
						
						
							
							Add type annotation for IconButton component ( #24753 )  
						
						
						
						
					 
					
						2023-05-02 12:53:32 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						32a030dd74 
					 
					
						
						
							
							Rewrite import feature ( #21054 )  
						
						
						
						
					 
					
						2023-05-02 12:08:48 +02:00 
						 
				 
			
				
					
						
							
							
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						fc56eda94b 
					 
					
						
						
							
							Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )  
						
						... 
						
						
						
						Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh > 
						
						
					 
					
						2023-05-01 18:23:57 +09:00 
						 
				 
			
				
					
						
							
							
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						15fd712464 
					 
					
						
						
							
							Add type annotation for RelativeTimestamp component ( #24749 )  
						
						
						
						
					 
					
						2023-05-01 00:51:31 +02:00 
						 
				 
			
				
					
						
							
							
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						81f75b1e0e 
					 
					
						
						
							
							Rewrite Icon and IconWithBadge with typescript ( #24747 )  
						
						
						
						
					 
					
						2023-05-01 00:51:00 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						d902a707a3 
					 
					
						
						
							
							Fix Rails/CompactBlank cop ( #24690 )  
						
						
						
						
					 
					
						2023-04-30 14:07:21 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						af824db398 
					 
					
						
						
							
							Fix Rails/InverseOf cop ( #24732 )  
						
						
						
						
					 
					
						2023-04-30 14:06:53 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						0a08e9d3d3 
					 
					
						
						
							
							New Crowdin updates ( #24678 )  
						
						... 
						
						
						
						Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh > 
						
						
					 
					
						2023-04-30 17:02:11 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 6028d047b9claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-04-29 18:54:13 +02:00 
						 
				 
			
				
					
						
							
							
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						1033598416 
					 
					
						
						
							
							[Glitch] Enable formatjs/prefer-pound-in-plural  
						
						... 
						
						
						
						Port 2daa5a1549claire.github-309c@sitedethib.com > 
						
						
					 
					
						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 105f8687e4claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-04-29 12:21:44 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						103b6de8b2 
					 
					
						
						
							
							[Glitch] Fix sass warning about deprecated slash as division ( #24653 )  
						
						... 
						
						
						
						Port 1527b02c6dnschonni@gmail.com >
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-04-29 12:17:06 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						7b01b7c3bf 
					 
					
						
						
							
							[Glitch] Add lines to threads in web UI  
						
						... 
						
						
						
						Port 290e4aba31claire.github-309c@sitedethib.com > 
						
						
					 
					
						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 7cf963eec2claire.github-309c@sitedethib.com > 
						
						
					 
					
						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 e1b4eeb636claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-04-29 11:28:24 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Schmidt 
							
						 
					 
					
						
						
							
						
						0091b28ffe 
					 
					
						
						
							
							[Glitch] Use CSS to trim long card descriptions  
						
						... 
						
						
						
						Port e713c545b8claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-04-29 11:26:58 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						11b34a903a 
					 
					
						
						
							
							[Glitch] Fix infinite loop in emoji replacement code  
						
						... 
						
						
						
						Port fbb4de3dbcclaire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-04-29 11:14:43 +02:00 
						 
				 
			
				
					
						
							
							
								Claire 
							
						 
					 
					
						
						
							
						
						0a813d96db 
					 
					
						
						
							
							[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)  
						
						... 
						
						
						
						Port 37886c28daclaire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-04-29 11:12:35 +02:00 
						 
				 
			
				
					
						
							
							
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						66bda4713e 
					 
					
						
						
							
							[Glitch] Allow == when null checking  
						
						... 
						
						
						
						Port c1a7e38d2bclaire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-04-29 11:09:46 +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