0092fe50ac 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb` 
							
						 
						
							2023-07-19 07:35:51 +02:00  
				
					
						
							
							
								 
						
							
								59b38f9ee4 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/mutes` ( #25622 )  
							
							
							
						 
						
							2023-07-18 13:05:19 +02:00  
				
					
						
							
							
								 
						
							
								58bfe8c43a 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/bookmarks` ( #25520 )  
							
							
							
						 
						
							2023-07-18 09:15:50 +02:00  
				
					
						
							
							
								 
						
							
								5a7c6c6597 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/timelines/public` ( #25746 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-18 09:15:18 +02:00  
				
					
						
							
							
								 
						
							
								19208aa422 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/statuses/:status_id/favourite` ( #25626 )  
							
							
							
						 
						
							2023-07-17 16:53:57 +02:00  
				
					
						
							
							
								 
						
							
								6fb4a756ff 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` ( #25624 )  
							
							
							
						 
						
							2023-07-17 16:51:49 +02:00  
				
					
						
							
							
								 
						
							
								4859958a0c 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/polls` ( #25596 )  
							
							
							
						 
						
							2023-07-17 16:50:00 +02:00  
				
					
						
							
							
								 
						
							
								1aea938d3d 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/statuses/:status_id/pin` ( #25635 )  
							
							
							
						 
						
							2023-07-17 16:24:05 +02:00  
				
					
						
							
							
								 
						
							
								6cdc8408a9 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/emails/confirmations` ( #25686 )  
							
							
							
						 
						
							2023-07-17 16:22:33 +02:00  
				
					
						
							
							
								 
						
							
								8a1aabaac1 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/timelines/home` ( #25743 )  
							
							
							
						 
						
							2023-07-17 16:20:11 +02:00  
				
					
						
							
							
								 
						
							
								6ac271c2a0 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/suggestions` ( #25540 )  
							
							
							
						 
						
							2023-06-22 11:49:35 +02:00  
				
					
						
							
							
								 
						
							
								e53eb38a8d 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/account_actions` ( #25514 )  
							
							
							
						 
						
							2023-06-20 18:16:48 +02:00  
				
					
						
							
							
								 
						
							
								0a0a1f1495 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/tags` ( #25439 )  
							
							
							
						 
						
							2023-06-19 08:51:40 +02:00  
				
					
						
							
							
								 
						
							
								b10c05e702 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/lists` ( #25443 )  
							
							
							
						 
						
							2023-06-15 10:19:51 +02:00  
				
					
						
							
							
								 
						
							
								24015ef0cc 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/domain_blocks` ( #25414 )  
							
							
							
						 
						
							2023-06-14 16:08:53 +02:00  
				
					
						
							
							
								 
						
							
								87aff5aad8 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/follow_requests` ( #25411 )  
							
							
							
						 
						
							2023-06-14 15:43:50 +02:00  
				
					
						
							
							
								 
						
							
								a5b62e56d0 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/apps/verify_credentials` ( #25404 )  
							
							
							
						 
						
							2023-06-14 09:48:57 +02:00  
				
					
						
							
							
								 
						
							
								a6407aa662 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/apps` ( #25401 )  
							
							
							
						 
						
							2023-06-14 09:48:48 +02:00  
				
					
						
							
							
								 
						
							
								4c5f62de99 
								
							 
						 
						
							
							
								
								Extract shared examples from api specs ( #25387 )  
							
							
							
						 
						
							2023-06-14 09:34:01 +02:00  
				
					
						
							
							
								 
						
							
								b19a695608 
								
							 
						 
						
							
							
								
								migrate test for `GET /api/v1/accounts/{account_id}` to request spec ( #25322 )  
							
							
							
						 
						
							2023-06-10 18:33:24 +02:00  
				
					
						
							
							
								 
						
							
								99216e34e5 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/canonical_email_blocks` ( #25330 )  
							
							
							
						 
						
							2023-06-10 18:33:02 +02:00  
				
					
						
							
							
								 
						
							
								b4e19f9610 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/ip_blocks` ( #25331 )  
							
							
							
						 
						
							2023-06-10 18:32:46 +02:00  
				
					
						
							
							
								 
						
							
								4301d8cbb3 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/domain_allows` ( #25333 )  
							
							
							
						 
						
							2023-06-10 18:32:26 +02:00  
				
					
						
							
							
								 
						
							
								841c220c40 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/domain_blocks` ( #25335 )  
							
							
							
						 
						
							2023-06-10 18:32:07 +02:00  
				
					
						
							
							
								 
						
							
								0e200d4e2f 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/reports` ( #25355 )  
							
							
							
						 
						
							2023-06-10 18:30:43 +02:00  
				
					
						
							
							
								 
						
							
								4aff1d2974 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/email_domain_blocks` ( #25337 )  
							
							
							
						 
						
							2023-06-09 14:00:14 +02:00  
				
					
						
							
							
								 
						
							
								b473df9a14 
								
							 
						 
						
							
							
								
								Improve test coverage for `/api/v1/featured_tags` ( #25076 )  
							
							
							
						 
						
							2023-05-23 09:01:11 +02:00