c75fe09e2b 
								
							 
						 
						
							
							
								
								Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-07-18 17:56:25 +02:00  
				
					
						
							
							
								 
						
							
								2616fde9e6 
								
							 
						 
						
							
							
								
								Use change-requiring records in admin/reports controller spec ( #31052 )  
							
							
							
						 
						
							2024-07-18 07:49:44 +00:00  
				
					
						
							
							
								 
						
							
								5e7720d11b 
								
							 
						 
						
							
							
								
								Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-07-17 22:20:12 +02:00  
				
					
						
							
							
								 
						
							
								76c2c5c748 
								
							 
						 
						
							
							
								
								Reduce extra round trips in `activitypub` controller specs ( #31041 )  
							
							
							
						 
						
							2024-07-17 08:09:34 +00:00  
				
					
						
							
							
								 
						
							
								55cf5e0188 
								
							 
						 
						
							
							
								
								Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-07-12 13:41:54 +02:00  
				
					
						
							
							
								 
						
							
								73d53827ea 
								
							 
						 
						
							
							
								
								Add change assertion to invites destroy spec ( #31004 )  
							
							
							
						 
						
							2024-07-12 08:19:15 +00:00  
				
					
						
							
							
								 
						
							
								6a55232988 
								
							 
						 
						
							
							
								
								Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-07-08 19:41:14 +02:00  
				
					
						
							
							
								 
						
							
								f1300ad284 
								
							 
						 
						
							
							
								
								Rename jobs/attachments rspec tag names ( #29762 )  
							
							
							
						 
						
							2024-07-08 16:01:08 +00:00  
				
					
						
							
							
								 
						
							
								e61a7794f8 
								
							 
						 
						
							
							
								
								Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly. 
							
						 
						
							2024-07-04 17:12:14 +02:00  
				
					
						
							
							
								 
						
							
								395f17ca17 
								
							 
						 
						
							
							
								
								Merge pull request from GHSA-vp5r-5pgw-jwqx  
							
							... 
							
							
							
							* Fix streaming sessions not being closed when revoking access to an app
* Add tests for GHSA-7w3c-p9j8-mq3x 
							
						 
						
							2024-07-04 16:11:28 +02:00  
				
					
						
							
							
								 
						
							
								6f2771cb32 
								
							 
						 
						
							
							
								
								Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-06-25 17:57:39 +02:00  
				
					
						
							
							
								 
						
							
								30ae5952d2 
								
							 
						 
						
							
							
								
								Fix: Ensure "With Media" is highlighted from Admin Accounts page ( #30812 )  
							
							
							
						 
						
							2024-06-25 07:46:53 +00:00  
				
					
						
							
							
								 
						
							
								21ca03581a 
								
							 
						 
						
							
							
								
								Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-06-24 19:39:42 +02:00  
				
					
						
							
							
								 
						
							
								8827cd597e 
								
							 
						 
						
							
							
								
								Fix `/admin/accounts/:account_id/statuses/:id` for edited posts with media attachments ( #30819 )  
							
							
							
						 
						
							2024-06-24 13:11:10 +00:00  
				
					
						
							
							
								 
						
							
								f214813919 
								
							 
						 
						
							
							
								
								Adapt settings spec to glitch-soc  
							
							
							
						 
						
							2024-06-11 19:54:27 +02:00  
				
					
						
							
							
								 
						
							
								4daed855e5 
								
							 
						 
						
							
							
								
								Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-06-11 19:46:11 +02:00  
				
					
						
							
							
								 
						
							
								edf6d64eeb 
								
							 
						 
						
							
							
								
								Use correct params in `settings/preferences/appearance` spec ( #30379 )  
							
							
							
						 
						
							2024-06-11 07:36:46 +00:00  
				
					
						
							
							
								 
						
							
								5ab111554e 
								
							 
						 
						
							
							
								
								Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-21 17:45:21 +02:00  
				
					
						
							
							
								 
						
							
								32223863a5 
								
							 
						 
						
							
							
								
								Add coverage to `/admin/accounts/:id` ( #30386 )  
							
							
							
						 
						
							2024-05-21 13:17:34 +00:00  
				
					
						
							
							
								 
						
							
								2810231180 
								
							 
						 
						
							
							
								
								Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change. 
							
						 
						
							2024-05-16 19:30:10 +02:00  
				
					
						
							
							
								 
						
							
								65e82211cd 
								
							 
						 
						
							
							
								
								Rename `cache_*` methods to `preload_*` in controller concern ( #30209 )  
							
							
							
						 
						
							2024-05-16 08:03:46 +00:00  
				
					
						
							
							
								 
						
							
								5fd56512de 
								
							 
						 
						
							
							
								
								Improve Report Notes and Account Moderation Notes ( #30288 )  
							
							
							
						 
						
							2024-05-15 13:38:36 +00:00  
				
					
						
							
							
								 
						
							
								9ce82a35cb 
								
							 
						 
						
							
							
								
								Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 18:42:26 +02:00  
				
					
						
							
							
								 
						
							
								babbf6017d 
								
							 
						 
						
							
							
								
								Remove caching in `cache_collection` ( #29862 )  
							
							
							
						 
						
							2024-04-08 13:46:13 +00:00  
				
					
						
							
							
								 
						
							
								e91ede5be6 
								
							 
						 
						
							
							
								
								Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-14 17:27:16 +01:00  
				
					
						
							
							
								 
						
							
								f9100743ec 
								
							 
						 
						
							
							
								
								Add `Api::ErrorHandling` concern for api/base controller ( #29574 )  
							
							
							
						 
						
							2024-03-14 09:09:47 +00:00  
				
					
						
							
							
								 
						
							
								65ca37bbaa 
								
							 
						 
						
							
							
								
								Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes. 
							
						 
						
							2024-03-13 20:14:18 +01: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  
				
					
						
							
							
								 
						
							
								06881a8669 
								
							 
						 
						
							
							
								
								Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-13 19:16:47 +01:00  
				
					
						
							
							
								 
						
							
								71e5f0f48c 
								
							 
						 
						
							
							
								
								Add coverage for suspended instance actor scenario ( #29571 )  
							
							
							
						 
						
							2024-03-13 15:43:40 +00:00  
				
					
						
							
							
								 
						
							
								46e902f1f3 
								
							 
						 
						
							
							
								
								Merge `api/v1/accounts/credentials` controller spec into existing request spec ( #29006 )  
							
							
							
						 
						
							2024-03-13 09:22:43 +00:00  
				
					
						
							
							
								 
						
							
								71eecbfa1f 
								
							 
						 
						
							
							
								
								Move `api/v2/filters/*` to request spec ( #28956 )  
							
							
							
						 
						
							2024-03-13 08:47:09 +00:00  
				
					
						
							
							
								 
						
							
								a5127d0ef8 
								
							 
						 
						
							
							
								
								Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did. 
							
						 
						
							2024-03-11 17:29:07 +01:00  
				
					
						
							
							
								 
						
							
								a38e424185 
								
							 
						 
						
							
							
								
								Use unchanging github links in docs/comments ( #29545 )  
							
							
							
						 
						
							2024-03-11 15:14:55 +00:00  
				
					
						
							
							
								 
						
							
								50b17f7e10 
								
							 
						 
						
							
							
								
								Add notification policies and notification requests ( #29366 )  
							
							
							
						 
						
							2024-03-07 14:53:37 +00:00  
				
					
						
							
							
								 
						
							
								159e500749 
								
							 
						 
						
							
							
								
								Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-01 18:34:48 +01:00  
				
					
						
							
							
								 
						
							
								18945f62e0 
								
							 
						 
						
							
							
								
								Convert more API specs from controller->request style ( #29004 )  
							
							
							
						 
						
							2024-03-01 16:24:45 +00:00  
				
					
						
							
							
								 
						
							
								4d7e7cc562 
								
							 
						 
						
							
							
								
								Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-29 18:24:47 +01:00  
				
					
						
							
							
								 
						
							
								eb1b8f69de 
								
							 
						 
						
							
							
								
								Allow pagination `Link` headers on API accounts/statuses when pinned true ( #29442 )  
							
							
							
						 
						
							2024-02-29 14:21:56 +00:00  
				
					
						
							
							
								 
						
							
								6675bf574a 
								
							 
						 
						
							
							
								
								Extract `parsed_uri_query_values` helper in ap/replies controller spec ( #29410 )  
							
							
							
						 
						
							2024-02-29 13:47:38 +00:00  
				
					
						
							
							
								 
						
							
								ccdf56085d 
								
							 
						 
						
							
							
								
								Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-28 20:37:38 +01:00  
				
					
						
							
							
								 
						
							
								a482932649 
								
							 
						 
						
							
							
								
								Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change. 
							
						 
						
							2024-02-27 19:20:57 +01:00  
				
					
						
							
							
								 
						
							
								8f3c91fc3c 
								
							 
						 
						
							
							
								
								Add `change` block expectation to `admin/invites#deactivate_all` spec ( #29412 )  
							
							
							
						 
						
							2024-02-27 16:25:58 +00:00  
				
					
						
							
							
								 
						
							
								9e78129e6e 
								
							 
						 
						
							
							
								
								Use "cacheable response" shared example in more places ( #29419 )  
							
							
							
						 
						
							2024-02-27 11:50:21 +00:00  
				
					
						
							
							
								 
						
							
								67ca8bb56a 
								
							 
						 
						
							
							
								
								Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead. 
							
						 
						
							2024-02-26 17:43:16 +01:00  
				
					
						
							
							
								 
						
							
								1540f42522 
								
							 
						 
						
							
							
								
								Better tests for auth/registrations#update ( #29303 )  
							
							
							
						 
						
							2024-02-26 16:09:56 +00:00  
				
					
						
							
							
								 
						
							
								d51c3ac087 
								
							 
						 
						
							
							
								
								Add a missing spec to `SessionsController#webauthn_options`  ( #29277 )  
							
							
							
						 
						
							2024-02-26 16:09:40 +00:00  
				
					
						
							
							
								 
						
							
								d2cfc6e5e2 
								
							 
						 
						
							
							
								
								Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 15:02:28 +01:00  
				
					
						
							
							
								 
						
							
								ef3d15554b 
								
							 
						 
						
							
							
								
								Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes. 
							
						 
						
							2024-02-24 14:46:14 +01:00  
				
					
						
							
							
								 
						
							
								ab2f0daa10 
								
							 
						 
						
							
							
								
								Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version. 
							
						 
						
							2024-02-24 14:27:43 +01:00  
				
					
						
							
							
								 
						
							
								5b9ddfcfcc 
								
							 
						 
						
							
							
								
								Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 14:18:16 +01:00  
				
					
						
							
							
								 
						
							
								dfd74f0dae 
								
							 
						 
						
							
							
								
								Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 14:15:49 +01:00  
				
					
						
							
							
								 
						
							
								73de36318e 
								
							 
						 
						
							
							
								
								Move `api/v1/timelines/direct` to request spec  
							
							
							
						 
						
							2024-02-24 14:10:05 +01:00  
				
					
						
							
							
								 
						
							
								9903e6beab 
								
							 
						 
						
							
							
								
								Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/controllers/api/v1/timelines/direct_controller_spec.rb`:
  `spec/controllers/api/v1/timelines` has been renamed, but we had an extra
  spec here for a glitch-soc-only endpoint.
  Kept glitch-soc's file unchanged (will port to a request spec later). 
							
						 
						
							2024-02-24 14:05:26 +01:00  
				
					
						
							
							
								 
						
							
								c297d999ba 
								
							 
						 
						
							
							
								
								Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 14:02:01 +01:00  
				
					
						
							
							
								 
						
							
								64f9939e39 
								
							 
						 
						
							
							
								
								Use `capture_emails` helper to improve email assertions in specs ( #29245 )  
							
							
							
						 
						
							2024-02-19 15:57:47 +00:00  
				
					
						
							
							
								 
						
							
								1946e171e6 
								
							 
						 
						
							
							
								
								Reduce round trips in admin/disputes/appeals spec ( #29234 )  
							
							
							
						 
						
							2024-02-16 13:46:28 +00:00  
				
					
						
							
							
								 
						
							
								3454fcbd71 
								
							 
						 
						
							
							
								
								Reduce round trips in auth/sessions spec ( #29233 )  
							
							
							
						 
						
							2024-02-16 13:38:49 +00:00  
				
					
						
							
							
								 
						
							
								a316c0e38d 
								
							 
						 
						
							
							
								
								Reduce round trips in disputes/appeals spec ( #29232 )  
							
							
							
						 
						
							2024-02-16 13:01:15 +00:00  
				
					
						
							
							
								 
						
							
								1690fb39e6 
								
							 
						 
						
							
							
								
								Reduce `RSpec/MultipleExpectations` in instance_actors_controller spec ( #29229 )  
							
							
							
						 
						
							2024-02-16 13:00:11 +00:00  
				
					
						
							
							
								 
						
							
								da50217b88 
								
							 
						 
						
							
							
								
								Combine repeated requests in `admin/accounts` controller spec ( #29119 )  
							
							
							
						 
						
							2024-02-07 10:59:32 +00:00  
				
					
						
							
							
								 
						
							
								2d6ab44556 
								
							 
						 
						
							
							
								
								Reduce request/response round-trips in ap/collections controller spec ( #29102 )  
							
							
							
						 
						
							2024-02-06 13:10:00 +00:00  
				
					
						
							
							
								 
						
							
								4cf07ed78c 
								
							 
						 
						
							
							
								
								Add missing action logging to `api/v1/admin/reports#update` ( #29044 )  
							
							
							
						 
						
							2024-02-06 11:34:11 +00:00  
				
					
						
							
							
								 
						
							
								f91acba70a 
								
							 
						 
						
							
							
								
								Combine repeated requests in account controller concern spec ( #28957 )  
							
							
							
						 
						
							2024-01-30 15:32:20 +00:00  
				
					
						
							
							
								 
						
							
								ff8937aa2c 
								
							 
						 
						
							
							
								
								Move `api/v1/statuses/*` to request spec ( #28954 )  
							
							
							
						 
						
							2024-01-26 17:45:54 +00:00  
				
					
						
							
							
								 
						
							
								5119fbc9b7 
								
							 
						 
						
							
							
								
								Move `api/v1/admin/trends/links/preview_card_providers` to request spec ( #28951 )  
							
							
							
						 
						
							2024-01-26 17:41:39 +00:00  
				
					
						
							
							
								 
						
							
								b6baab447d 
								
							 
						 
						
							
							
								
								Move `api/v2/admin/accounts` to request spec ( #28950 )  
							
							
							
						 
						
							2024-01-26 17:41:13 +00:00  
				
					
						
							
							
								 
						
							
								7adcc0aae3 
								
							 
						 
						
							
							
								
								Move `api/v1/trends/*` to request specs ( #28949 )  
							
							
							
						 
						
							2024-01-26 17:40:39 +00:00  
				
					
						
							
							
								 
						
							
								0b0ca6f3b8 
								
							 
						 
						
							
							
								
								Move `api/v1/timelines/list` to request spec ( #28948 )  
							
							
							
						 
						
							2024-01-26 17:40:15 +00:00  
				
					
						
							
							
								 
						
							
								685eaa04d4 
								
							 
						 
						
							
							
								
								Combine double subject in admin/statuses controller shared example ( #28940 )  
							
							
							
						 
						
							2024-01-26 16:30:30 +00:00  
				
					
						
							
							
								 
						
							
								beb74fd71c 
								
							 
						 
						
							
							
								
								Combine double subjects in instance actors controller shared example ( #28939 )  
							
							
							
						 
						
							2024-01-26 16:28:50 +00:00  
				
					
						
							
							
								 
						
							
								beaef4b672 
								
							 
						 
						
							
							
								
								Combine double subjects in application controller shared example ( #28938 )  
							
							
							
						 
						
							2024-01-26 16:23:12 +00:00  
				
					
						
							
							
								 
						
							
								2f8656334d 
								
							 
						 
						
							
							
								
								Combine double subjects in `admin/accounts` controller spec ( #28936 )  
							
							
							
						 
						
							2024-01-26 16:21:31 +00:00  
				
					
						
							
							
								 
						
							
								9cc1817bb4 
								
							 
						 
						
							
							
								
								Fix intmermittent failure in `api/v1/accounts/statuses` controller spec ( #28931 )  
							
							
							
						 
						
							2024-01-26 14:10:26 +00:00  
				
					
						
							
							
								 
						
							
								70de52c297 
								
							 
						 
						
							
							
								
								Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-25 19:51:19 +01:00  
				
					
						
							
							
								 
						
							
								a11a2fb052 
								
							 
						 
						
							
							
								
								Add error classes to api/base errors coverage ( #28864 )  
							
							
							
						 
						
							2024-01-24 10:31:31 +00:00  
				
					
						
							
							
								 
						
							
								102eff7c05 
								
							 
						 
						
							
							
								
								Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-22 19:19:40 +01:00  
				
					
						
							
							
								 
						
							
								0700eb58bc 
								
							 
						 
						
							
							
								
								Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-22 19:12:05 +01:00  
				
					
						
							
							
								 
						
							
								e2d9635074 
								
							 
						 
						
							
							
								
								Add notification email on invalid second authenticator ( #28822 )  
							
							
							
						 
						
							2024-01-22 13:55:43 +00:00  
				
					
						
							
							
								 
						
							
								7ecf7f5403 
								
							 
						 
						
							
							
								
								Move controller->request specs for api/v1/statuses/* ( #28818 )  
							
							
							
						 
						
							2024-01-22 11:58:54 +00:00  
				
					
						
							
							
								 
						
							
								3593ee2e36 
								
							 
						 
						
							
							
								
								Add rate-limit of TOTP authentication attempts at controller level ( #28801 )  
							
							
							
						 
						
							2024-01-19 12:19:49 +00:00  
				
					
						
							
							
								 
						
							
								329911b0a3 
								
							 
						 
						
							
							
								
								Migrate controller->request spec for api/v1/follow*  ( #28811 )  
							
							
							
						 
						
							2024-01-19 09:32:41 +00:00  
				
					
						
							
							
								 
						
							
								278597c161 
								
							 
						 
						
							
							
								
								Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-15 20:53:16 +01:00  
				
					
						
							
							
								 
						
							
								2f521bc84a 
								
							 
						 
						
							
							
								
								Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-15 20:27:41 +01:00  
				
					
						
							
							
								 
						
							
								1323dfac80 
								
							 
						 
						
							
							
								
								Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-15 19:19:04 +01:00  
				
					
						
							
							
								 
						
							
								e621c1c44c 
								
							 
						 
						
							
							
								
								Fix registrations not checking MX records for email domain blocks requiring approval ( #28608 )  
							
							
							
						 
						
							2024-01-15 17:10:57 +00:00  
				
					
						
							
							
								 
						
							
								e72676e83a 
								
							 
						 
						
							
							
								
								Improve `api/v1/markers#create` performance against simultaneous requests ( #28718 )  
							
							
							
						 
						
							2024-01-15 09:47:25 +00:00  
				
					
						
							
							
								 
						
							
								a3b6a85521 
								
							 
						 
						
							
							
								
								Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file. 
							
						 
						
							2024-01-13 12:11:29 +01:00  
				
					
						
							
							
								 
						
							
								a90696011e 
								
							 
						 
						
							
							
								
								Add coverage/bugfix for invalid appeal submission ( #28703 )  
							
							
							
						 
						
							2024-01-12 09:21:00 +00:00  
				
					
						
							
							
								 
						
							
								32eeca9c7b 
								
							 
						 
						
							
							
								
								Refresh instance counts in spec (fixes intermittent failure) ( #28698 )  
							
							
							
						 
						
							2024-01-12 09:10:37 +00:00  
				
					
						
							
							
								 
						
							
								15bc13c65b 
								
							 
						 
						
							
							
								
								Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-11 20:15:19 +01:00  
				
					
						
							
							
								 
						
							
								185c806d69 
								
							 
						 
						
							
							
								
								Extract spec helper for verifing to/from public AP collection namespace ( #28472 )  
							
							
							
						 
						
							2024-01-11 16:17:21 +00:00  
				
					
						
							
							
								 
						
							
								23d8bd8ce1 
								
							 
						 
						
							
							
								
								Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-11 13:24:20 +01:00  
				
					
						
							
							
								 
						
							
								87097a227c 
								
							 
						 
						
							
							
								
								Clean up `settings/featured_tags/index` view ( #28688 )  
							
							
							
						 
						
							2024-01-11 10:45:26 +00:00  
				
					
						
							
							
								 
						
							
								55802242ce 
								
							 
						 
						
							
							
								
								Refactor login activity partial (remove inline ruby) ( #28687 )  
							
							
							
						 
						
							2024-01-11 10:36:27 +00:00  
				
					
						
							
							
								 
						
							
								0b2c7cdb02 
								
							 
						 
						
							
							
								
								Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`. 
							
						 
						
							2024-01-10 17:51:12 +01:00  
				
					
						
							
							
								 
						
							
								d7e13e2483 
								
							 
						 
						
							
							
								
								Fix potential redirection loop of streaming endpoint ( #28665 )  
							
							
							
						 
						
							2024-01-10 15:05:46 +00:00  
				
					
						
							
							
								 
						
							
								00341c70ff 
								
							 
						 
						
							
							
								
								Use Sidekiq `fake!` instead of `inline!` in specs ( #25369 )  
							
							
							
						 
						
							2024-01-10 11:06:58 +00:00  
				
					
						
							
							
								 
						
							
								6ad0fb5a77 
								
							 
						 
						
							
							
								
								Fix NULL MX handling and tighten DNS resolving specs ( #28607 )  
							
							
							
						 
						
							2024-01-05 11:07:57 +00:00  
				
					
						
							
							
								 
						
							
								dfdadb92e8 
								
							 
						 
						
							
							
								
								Add ability to require approval when users sign up using specific email domains ( #28468 )  
							
							
							
						 
						
							2024-01-04 09:07:05 +00:00  
				
					
						
							
							
								 
						
							
								c5b0e6d5a0 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-28 16:57:10 +01:00  
				
					
						
							
							
								 
						
							
								a2624ff739 
								
							 
						 
						
							
							
								
								Convert signature verification specs to request specs ( #28443 )  
							
							
							
						 
						
							2023-12-22 18:56:22 +00:00  
				
					
						
							
							
								 
						
							
								513d35969e 
								
							 
						 
						
							
							
								
								Fix `RSpec/LetSetup` cop in auth controller specs ( #28464 )  
							
							
							
						 
						
							2023-12-22 08:03:59 +00:00  
				
					
						
							
							
								 
						
							
								f5b7307890 
								
							 
						 
						
							
							
								
								Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines. 
							
						 
						
							2023-12-21 19:24:10 +01:00  
				
					
						
							
							
								 
						
							
								6e56f95285 
								
							 
						 
						
							
							
								
								Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file. 
							
						 
						
							2023-12-21 18:17:17 +01:00  
				
					
						
							
							
								 
						
							
								cd64a5b2ec 
								
							 
						 
						
							
							
								
								Clean up of `RSpec/LetSetup` within `api/` ( #28448 )  
							
							
							
						 
						
							2023-12-21 10:10:18 +00:00  
				
					
						
							
							
								 
						
							
								f32d672d2f 
								
							 
						 
						
							
							
								
								Clean up of `RSpec/LetSetup` within `spec/controllers` ( #28446 )  
							
							
							
						 
						
							2023-12-21 09:28:41 +00:00  
				
					
						
							
							
								 
						
							
								077e0c6812 
								
							 
						 
						
							
							
								
								Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system. 
							
						 
						
							2023-12-20 22:16:50 +01:00  
				
					
						
							
							
								 
						
							
								75580360cd 
								
							 
						 
						
							
							
								
								Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
  `Metrics/AbcSize` cop.
  Glitch-soc has different code and slightly higher `AbcSize` complexity,
  modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
  Upstream changed `account.suspended?` to `account.unavailable?` to prepare
  for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings. 
							
						 
						
							2023-12-20 22:05:31 +01:00  
				
					
						
							
							
								 
						
							
								8a5f2442cc 
								
							 
						 
						
							
							
								
								Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-20 21:58:18 +01:00  
				
					
						
							
							
								 
						
							
								b8209c3b96 
								
							 
						 
						
							
							
								
								Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now. 
							
						 
						
							2023-12-20 20:10:45 +01:00  
				
					
						
							
							
								 
						
							
								b135b6ba8f 
								
							 
						 
						
							
							
								
								Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Conflict caused by glitch-soc having a different file size limit constant
  name.
  Updated like upstream did while keeping glitch-soc's constant name. 
							
						 
						
							2023-12-19 21:24:01 +01:00  
				
					
						
							
							
								 
						
							
								2e786e13cb 
								
							 
						 
						
							
							
								
								Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/validators/status_pin_validator.rb`:
  Upstream refactored that file, while glitch-soc had configurable limits for
  pinned statuses.
  Updated the code with upstream's refactor, while keeping glitch-soc's
  configurability. 
							
						 
						
							2023-12-19 20:51:37 +01:00  
				
					
						
							
							
								 
						
							
								d288a6162a 
								
							 
						 
						
							
							
								
								Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-19 20:40:05 +01:00  
				
					
						
							
							
								 
						
							
								b24f676cf1 
								
							 
						 
						
							
							
								
								Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-19 20:24:57 +01:00  
				
					
						
							
							
								 
						
							
								3ad92e8d0d 
								
							 
						 
						
							
							
								
								Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-19 20:17:23 +01:00  
				
					
						
							
							
								 
						
							
								6fed0fcbaa 
								
							 
						 
						
							
							
								
								Remove unneeded settings cleanup from specs ( #28425 )  
							
							
							
						 
						
							2023-12-19 15:17:22 +00:00  
				
					
						
							
							
								 
						
							
								a111fd7a0b 
								
							 
						 
						
							
							
								
								Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-18 20:47:27 +01:00  
				
					
						
							
							
								 
						
							
								d6ad9d351e 
								
							 
						 
						
							
							
								
								Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-18 19:10:43 +01:00  
				
					
						
							
							
								 
						
							
								b474cbbd28 
								
							 
						 
						
							
							
								
								Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
  We differed by listing suspended users when requesting relationships.
  Updated to upstream's code. 
							
						 
						
							2023-12-18 18:40:58 +01:00  
				
					
						
							
							
								 
						
							
								46ddaffd40 
								
							 
						 
						
							
							
								
								Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-12-18 18:34:25 +01:00  
				
					
						
							
							
								 
						
							
								bc33be0342 
								
							 
						 
						
							
							
								
								Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies. 
							
						 
						
							2023-12-18 18:07:24 +01:00  
				
					
						
							
							
								 
						
							
								4113fbf6e8 
								
							 
						 
						
							
							
								
								Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules. 
							
						 
						
							2023-12-17 23:04:16 +01:00  
				
					
						
							
							
								 
						
							
								1474318691 
								
							 
						 
						
							
							
								
								Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main  
							
							... 
							
							
							
							Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream fixed a bug in the trending post condition.
  Glitch-soc's condition is different because we potentially allow CWed content
  to trend.
  Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
  Kept our version for now, we will switch to upstream later down the road. 
							
						 
						
							2023-12-17 15:32:29 +01:00  
				
					
						
							
							
								 
						
							
								b1dec09d20 
								
							 
						 
						
							
							
								
								Fix `Style/InverseMethods` cop ( #28377 )  
							
							
							
						 
						
							2023-12-15 15:52:00 +00:00  
				
					
						
							
							
								 
						
							
								ef9797a395 
								
							 
						 
						
							
							
								
								Un-nest contexts in `settings/2fa/webauthn` spec ( #28359 )  
							
							
							
						 
						
							2023-12-14 10:46:43 +00:00  
				
					
						
							
							
								 
						
							
								adbfd40a1b 
								
							 
						 
						
							
							
								
								Convert `api/v1/directories` controller spec to request spec ( #28356 )  
							
							
							
						 
						
							2023-12-14 10:38:06 +00:00  
				
					
						
							
							
								 
						
							
								28e1a7a394 
								
							 
						 
						
							
							
								
								Improve spec coverage for `models/announcement` class ( #28350 )  
							
							
							
						 
						
							2023-12-14 10:29:10 +00:00  
				
					
						
							
							
								 
						
							
								0e4233de9d 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v2/suggestions` ( #28297 )  
							
							
							
						 
						
							2023-12-11 08:13:57 +00:00  
				
					
						
							
							
								 
						
							
								0c64092500 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/accounts/search` ( #28299 )  
							
							
							
						 
						
							2023-12-11 08:13:28 +00:00  
				
					
						
							
							
								 
						
							
								16ede59d0a 
								
							 
						 
						
							
							
								
								Controller spec to request spec: `api/v1/featured_tags/suggestions` ( #28298 )  
							
							
							
						 
						
							2023-12-11 08:00:41 +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  
				
					
						
							
							
								 
						
							
								9f92b05bd2 
								
							 
						 
						
							
							
								
								Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md` 
							
						 
						
							2023-12-10 18:05:02 +01:00  
				
					
						
							
							
								 
						
							
								7e514688b3 
								
							 
						 
						
							
							
								
								Convert `api/v2/search` controller spec to request spec ( #28269 )  
							
							
							
						 
						
							2023-12-08 09:27:33 +00:00  
				
					
						
							
							
								 
						
							
								cca19f5fbb 
								
							 
						 
						
							
							
								
								Use the `Admin::ActionLog` fabricator in admin/action_logs spec ( #28194 )  
							
							
							
						 
						
							2023-12-04 12:56:28 +00:00  
				
					
						
							
							
								 
						
							
								19ad51253d 
								
							 
						 
						
							
							
								
								Prevent triple-subject run in admin/domain_blocks spec ( #28195 )  
							
							
							
						 
						
							2023-12-04 09:02:40 +00:00  
				
					
						
							
							
								 
						
							
								d848d8d87c 
								
							 
						 
						
							
							
								
								Add helper methods for domains allow and export blocks files ( #28196 )  
							
							
							
						 
						
							2023-12-04 08:52:21 +00:00  
				
					
						
							
							
								 
						
							
								b751078fcd 
								
							 
						 
						
							
							
								
								Eliminate double subject call in admin/ controller specs ( #28158 )  
							
							
							
						 
						
							2023-12-01 10:38:15 +00:00  
				
					
						
							
							
								 
						
							
								1f1c75bba5 
								
							 
						 
						
							
							
								
								File cleanup/organization in `controllers/concerns` ( #27846 )  
							
							
							
						 
						
							2023-11-30 14:39:41 +00:00  
				
					
						
							
							
								 
						
							
								0530ce5e95 
								
							 
						 
						
							
							
								
								Convert accounts controller spec to request spec ( #28126 )  
							
							
							
						 
						
							2023-11-30 14:28:05 +00:00  
				
					
						
							
							
								 
						
							
								e7c340a634 
								
							 
						 
						
							
							
								
								Spec coverage for missing `q` param and error conditions in `api/v2/search` controller ( #27842 )  
							
							
							
						 
						
							2023-11-30 13:59:46 +00:00  
				
					
						
							
							
								 
						
							
								ce78a9c9ac 
								
							 
						 
						
							
							
								
								Clean up `two_factor_authentication/confirmations` controller spec ( #28128 )  
							
							
							
						 
						
							2023-11-30 11:44:42 +00:00  
				
					
						
							
							
								 
						
							
								e6fd9a59e6 
								
							 
						 
						
							
							
								
								Fix FamiliarFollowersController test response comparison ( #28121 )  
							
							... 
							
							
							
							Co-authored-by: Filippo Giunchedi <filippo@debian.org> 
							
						 
						
							2023-11-30 10:58:40 +00:00  
				
					
						
							
							
								 
						
							
								291dc04e67 
								
							 
						 
						
							
							
								
								Remove un-needed `action` and `template` options to `render` in controllers ( #28022 )  
							
							
							
						 
						
							2023-11-29 10:38:05 +00:00  
				
					
						
							
							
								 
						
							
								7877fcd83c 
								
							 
						 
						
							
							
								
								Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )  
							
							
							
						 
						
							2023-11-23 10:00:09 +00:00