Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c46afb82 
								
							 
						 
						
							
							
								
								Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-24 21:50:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d0a26a2a16 
								
							 
						 
						
							
							
								
								Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-24 21:03:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								1f30778ec6 
								
							 
						 
						
							
							
								
								Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there. 
							
						 
						
							2023-08-24 21:01:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								2e58f75da6 
								
							 
						 
						
							
							
								
								Fix timeout on invalid set of exclusionary parameters in /api/v1/timelines/public ( #26239 )  
							
							
							
						 
						
							2023-08-23 15:50:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5458629e60 
								
							 
						 
						
							
							
								
								Refactor Api::V1::ProfilesController into two separate controllers ( #26573 )  
							
							
							
						 
						
							2023-08-21 15:47:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								89d2b28e0b 
								
							 
						 
						
							
							
								
								Add ability to delete avatar or header picture via the API ( #25124 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-21 08:44:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6d6acefcc1 
								
							 
						 
						
							
							
								
								Merge commit '788d7a6a2a4582601dd741ad880ef7b775335d14' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-12 09:36:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								32faa7213f 
								
							 
						 
						
							
							
								
								Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README 
							
						 
						
							2023-08-11 22:15:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								788d7a6a2a 
								
							 
						 
						
							
							
								
								Add GET /api/v1/instance/languages to REST API ( #24443 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-03 11:25:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								e395939ead 
								
							 
						 
						
							
							
								
								Refactor: replace whitelist_mode mentions with limited_federation_mode ( #26252 )  
							
							
							
						 
						
							2023-08-02 19:32:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								20e9ed14c9 
								
							 
						 
						
							
							
								
								Add List-Unsubscribe email header ( #26085 )  
							
							
							
						 
						
							2023-08-01 19:34:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a84632b619 
								
							 
						 
						
							
							
								
								Fix CSP tests in glitch-soc  
							
							
							
						 
						
							2023-07-30 17:30:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								68d080177a 
								
							 
						 
						
							
							
								
								Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-30 15:54:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f55959ebd9 
								
							 
						 
						
							
							
								
								Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns. 
							
						 
						
							2023-07-30 14:58:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								cb4ffdea8b 
								
							 
						 
						
							
							
								
								Merge commit '1d3f8af23a23c2d3d8399d7b4367de69b72e269a' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version. 
							
						 
						
							2023-07-30 13:49:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2f3f1d75fa 
								
							 
						 
						
							
							
								
								Merge commit '58b52b7a33717406faa8d988b7c05efa52f46f6a' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file. 
							
						 
						
							2023-07-30 13:15:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								03c444d6e2 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v2/filters ( #25721 )  
							
							
							
						 
						
							2023-07-27 14:58:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								2a0b6be46a 
								
							 
						 
						
							
							
								
								Coverage for Auth::OmniauthCallbacks controller ( #26147 )  
							
							
							
						 
						
							2023-07-25 09:46:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5664c5370f 
								
							 
						 
						
							
							
								
								Fix CSP headers being unintendedly wide ( #26105 )  
							
							
							
						 
						
							2023-07-21 13:34:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								540cced981 
								
							 
						 
						
							
							
								
								Wrong count in response when removing favourite/reblog ( #24365 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-19 09:02:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d315c684e4 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								c05ff864cc 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/mutes ( #25622 )  
							
							
							
						 
						
							2023-07-18 13:05:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								03eaa9746c 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/bookmarks ( #25520 )  
							
							
							
						 
						
							2023-07-18 09:15:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								580d5831ec 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								381baa978a 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/statuses/:status_id/favourite ( #25626 )  
							
							
							
						 
						
							2023-07-17 16:53:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								b9694cb13e 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/statuses/:status_id/bookmark ( #25624 )  
							
							
							
						 
						
							2023-07-17 16:51:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								31b2765f6e 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/polls ( #25596 )  
							
							
							
						 
						
							2023-07-17 16:50:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								32b7709183 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/statuses/:status_id/pin ( #25635 )  
							
							
							
						 
						
							2023-07-17 16:24:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								07cb4e35f4 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/emails/confirmations ( #25686 )  
							
							
							
						 
						
							2023-07-17 16:22:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								9c6f214c17 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/timelines/home ( #25743 )  
							
							
							
						 
						
							2023-07-17 16:20:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								618eb10d18 
								
							 
						 
						
							
							
								
								Fix embed dropdown menu item for unauthenticated users ( #25964 )  
							
							
							
						 
						
							2023-07-13 15:53:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0b9ced4b0c 
								
							 
						 
						
							
							
								
								Fix processing of media files with unusual names ( #25788 )  
							
							
							
						 
						
							2023-07-07 13:35:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								33f3a9c5f5 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/suggestions ( #25540 )  
							
							
							
						 
						
							2023-06-22 11:49:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								88cdb02d89 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/admin/account_actions ( #25514 )  
							
							
							
						 
						
							2023-06-20 18:16:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								a27a33ebde 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/tags ( #25439 )  
							
							
							
						 
						
							2023-06-19 08:51:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								dc9352a450 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/lists ( #25443 )  
							
							
							
						 
						
							2023-06-15 10:19:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								507a7e785a 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/domain_blocks ( #25414 )  
							
							
							
						 
						
							2023-06-14 16:08:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								895e157b4d 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/follow_requests ( #25411 )  
							
							
							
						 
						
							2023-06-14 15:43:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								943c99f780 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/apps/verify_credentials ( #25404 )  
							
							
							
						 
						
							2023-06-14 09:48:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								51fdaefad4 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/apps ( #25401 )  
							
							
							
						 
						
							2023-06-14 09:48:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								bc7346ab9c 
								
							 
						 
						
							
							
								
								Extract shared examples from api specs ( #25387 )  
							
							
							
						 
						
							2023-06-14 09:34:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								c31e2b3267 
								
							 
						 
						
							
							
								
								migrate test for GET /api/v1/accounts/{account_id} to request spec ( #25322 )  
							
							
							
						 
						
							2023-06-10 18:33:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								e2323fdcf6 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/admin/canonical_email_blocks ( #25330 )  
							
							
							
						 
						
							2023-06-10 18:33:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								e359a19387 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/admin/ip_blocks ( #25331 )  
							
							
							
						 
						
							2023-06-10 18:32:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								9c7f3acaf6 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/admin/domain_allows ( #25333 )  
							
							
							
						 
						
							2023-06-10 18:32:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								70cc460c39 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/admin/domain_blocks ( #25335 )  
							
							
							
						 
						
							2023-06-10 18:32:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								1a723c3425 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/admin/reports ( #25355 )  
							
							
							
						 
						
							2023-06-10 18:30:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								14fa204dfc 
								
							 
						 
						
							
							
								
								Migrate to request specs in /api/v1/admin/email_domain_blocks ( #25337 )  
							
							
							
						 
						
							2023-06-09 14:00:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								1361e4cb7a 
								
							 
						 
						
							
							
								
								Add request spec for backups download ( #25099 )  
							
							
							
						 
						
							2023-05-23 15:44:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel M Brasil 
								
							 
						 
						
							
							
							
							
								
							
							
								ffce0d14bd 
								
							 
						 
						
							
							
								
								Improve test coverage for /api/v1/featured_tags ( #25076 )  
							
							
							
						 
						
							2023-05-23 09:01:11 +02:00