55cf5e0188 
								
							 
						 
						
							
							
								
								Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-07-12 13:41:54 +02:00  
				
					
						
							
							
								 
						
							
								43e24dbb13 
								
							 
						 
						
							
							
								
								Use `include_pagination_headers` in more places ( #30999 )  
							
							
							
						 
						
							2024-07-12 08:30:52 +00:00  
				
					
						
							
							
								 
						
							
								30b00ca2b5 
								
							 
						 
						
							
							
								
								Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-06-06 12:27:26 +02:00  
				
					
						
							
							
								 
						
							
								e02d23b549 
								
							 
						 
						
							
							
								
								Change `read:me` scope to `profile` scope ( #30357 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-06-06 07:30:10 +00:00  
				
					
						
							
							
								 
						
							
								f09f5b35f2 
								
							 
						 
						
							
							
								
								Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb` 
							
						 
						
							2024-05-04 16:12:51 +02:00  
				
					
						
							
							
								 
						
							
								b039e62194 
								
							 
						 
						
							
							
								
								Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 19:49:59 +02:00  
				
					
						
							
							
								 
						
							
								049b159beb 
								
							 
						 
						
							
							
								
								Add read:me OAuth 2.0 scope, allowing more limited access to user data ( #29087 )  
							
							
							
						 
						
							2024-04-23 11:47:00 +00:00  
				
					
						
							
							
								 
						
							
								08b10cce52 
								
							 
						 
						
							
							
								
								Merge commit 'b43eaa4517107326c7e73b949cec759f841b4a30' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/controllers/api/v1/accounts/credentials_controller_spec.rb`
  Conflict due to glitch-soc's different note length handling.
  Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead. 
							
						 
						
							2024-03-13 20:12:58 +01:00  
				
					
						
							
							
								 
						
							
								46e902f1f3 
								
							 
						 
						
							
							
								
								Merge `api/v1/accounts/credentials` controller spec into existing request spec ( #29006 )  
							
							
							
						 
						
							2024-03-13 09:22:43 +00:00  
				
					
						
							
							
								 
						
							
								18945f62e0 
								
							 
						 
						
							
							
								
								Convert more API specs from controller->request style ( #29004 )  
							
							
							
						 
						
							2024-03-01 16:24:45 +00:00  
				
					
						
							
							
								 
						
							
								329911b0a3 
								
							 
						 
						
							
							
								
								Migrate controller->request spec for api/v1/follow*  ( #28811 )  
							
							
							
						 
						
							2024-01-19 09:32:41 +00:00  
				
					
						
							
							
								 
						
							
								0c64092500 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/accounts/search` ( #28299 )  
							
							
							
						 
						
							2023-12-11 08:13:28 +00:00  
				
					
						
							
							
								 
						
							
								809506bdd4 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/accounts/pins` ( #28300 )  
							
							
							
						 
						
							2023-12-11 07:59:40 +00:00  
				
					
						
							
							
								 
						
							
								94cc707ab3 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/accounts/notes` ( #28301 )  
							
							
							
						 
						
							2023-12-11 07:58:48 +00:00  
				
					
						
							
							
								 
						
							
								e544b6df42 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/accounts/lookup` ( #28302 )  
							
							
							
						 
						
							2023-12-11 07:57:33 +00:00  
				
					
						
							
							
								 
						
							
								a968898dc7 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/accounts/lists` ( #28303 )  
							
							
							
						 
						
							2023-12-11 07:56:47 +00:00  
				
					
						
							
							
								 
						
							
								8f94502e7d 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/accounts/identify_proofs` ( #28304 )  
							
							
							
						 
						
							2023-12-11 07:56:13 +00:00  
				
					
						
							
							
								 
						
							
								78347d2556 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/accounts/familiar_followers` ( #28305 )  
							
							
							
						 
						
							2023-12-11 07:55:45 +00:00  
				
					
						
							
							
								 
						
							
								11d2bd9716 
								
							 
						 
						
							
							
								
								Fix intermittent failure from unspecified order in `api/v1/accounts/relationships` spec ( #28306 )  
							
							
							
						 
						
							2023-12-11 07:55:07 +00:00  
				
					
						
							
							
								 
						
							
								7877fcd83c 
								
							 
						 
						
							
							
								
								Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )  
							
							
							
						 
						
							2023-11-23 10:00:09 +00:00  
				
					
						
							
							
								 
						
							
								3f0c1566c3 
								
							 
						 
						
							
							
								
								Reduce expectations for `RSpec/MultipleExpectations` cop in `api/v1/accounts/relationships` spec ( #27879 )  
							
							
							
						 
						
							2023-11-16 09:55:50 +00:00  
				
					
						
							
							
								 
						
							
								5e2ecc736d 
								
							 
						 
						
							
							
								
								Remove double `subject` in api/v1/accounts/relationships spec ( #27839 )  
							
							
							
						 
						
							2023-11-14 10:29:33 +00:00  
				
					
						
							
							
								 
						
							
								c451bbe249 
								
							 
						 
						
							
							
								
								Allow viewing and severing relationships with suspended accounts ( #27667 )  
							
							
							
						 
						
							2023-11-09 14:50:25 +00:00  
				
					
						
							
							
								 
						
							
								bbf46cc418 
								
							 
						 
						
							
							
								
								Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )  
							
							
							
						 
						
							2023-10-27 08:35:21 +00:00  
				
					
						
							
							
								 
						
							
								828eebad48 
								
							 
						 
						
							
							
								
								Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API ( #26998 )  
							
							
							
						 
						
							2023-09-20 18:25:16 +02:00