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  
				
					
						
							
							
								 
						
							
								973597c6f1 
								
							 
						 
						
							
							
								
								Consolidate configuration of `Sidekiq::Testing.fake!` setup ( #28046 )  
							
							
							
						 
						
							2023-11-23 09:43:43 +00:00  
				
					
						
							
							
								 
						
							
								cdc57c74b7 
								
							 
						 
						
							
							
								
								Fix unsupported time zone or locale preventing sign-up ( #28035 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-11-22 11:38:07 +00:00  
				
					
						
							
							
								 
						
							
								30ee4aaff4 
								
							 
						 
						
							
							
								
								Convert measurement `api/v1/admin/*` controller specs to request specs ( #28005 )  
							
							
							
						 
						
							2023-11-21 14:25:07 +00:00  
				
					
						
							
							
								 
						
							
								32e19e3af6 
								
							 
						 
						
							
							
								
								Reduce `.times` usage in request and controller specs ( #27949 )  
							
							
							
						 
						
							2023-11-21 13:05:59 +00:00  
				
					
						
							
							
								 
						
							
								f7cb64a184 
								
							 
						 
						
							
							
								
								Add coverage for `settings/privacy` controller ( #28000 )  
							
							
							
						 
						
							2023-11-21 13:02:37 +00:00  
				
					
						
							
							
								 
						
							
								b2e8af8889 
								
							 
						 
						
							
							
								
								Add coverage for `settings/verifications` controller ( #28001 )  
							
							
							
						 
						
							2023-11-21 11:00:22 +00:00  
				
					
						
							
							
								 
						
							
								876f5b1d12 
								
							 
						 
						
							
							
								
								Convert `/instances/*` controller specs to request specs ( #27988 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-11-20 11:05:28 +00:00  
				
					
						
							
							
								 
						
							
								718c95e7af 
								
							 
						 
						
							
							
								
								Convert `api/v1/custom_emojis` controller spec to request spec ( #27985 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-11-20 11:05:24 +00:00  
				
					
						
							
							
								 
						
							
								17582d36d5 
								
							 
						 
						
							
							
								
								Convert `api/v1/preferences` controller spec to request spec ( #27987 )  
							
							
							
						 
						
							2023-11-20 09:39:45 +00:00  
				
					
						
							
							
								 
						
							
								9a01a260a0 
								
							 
						 
						
							
							
								
								Convert `api/v1/scheduled_statuses` controller spec to request spec ( #27986 )  
							
							
							
						 
						
							2023-11-20 09:36:49 +00:00  
				
					
						
							
							
								 
						
							
								b9fb47aeb1 
								
							 
						 
						
							
							
								
								Convert `api/v1/endorsements` controller spec to request spec ( #27984 )  
							
							
							
						 
						
							2023-11-20 09:32:28 +00:00  
				
					
						
							
							
								 
						
							
								297839c10c 
								
							 
						 
						
							
							
								
								Rewrite `/api/v1/statuses` tests as request specs ( #27891 )  
							
							
							
						 
						
							2023-11-17 11:36:04 +00:00  
				
					
						
							
							
								 
						
							
								9257737675 
								
							 
						 
						
							
							
								
								Rewrite `/api/v1/accounts` tests as request specs ( #27888 )  
							
							
							
						 
						
							2023-11-17 11:34:49 +00:00  
				
					
						
							
							
								 
						
							
								c1f93def40 
								
							 
						 
						
							
							
								
								Reduce expectations for `RSpec/MultipleExpectations` cop in `controllers/statuses` spec ( #27875 )  
							
							
							
						 
						
							2023-11-16 09:54:51 +00:00  
				
					
						
							
							
								 
						
							
								3de9145613 
								
							 
						 
						
							
							
								
								Move controller specs for `well-known` endpoints to request specs ( #27855 )  
							
							
							
						 
						
							2023-11-15 19:12:02 +00:00  
				
					
						
							
							
								 
						
							
								fe58ac8d9f 
								
							 
						 
						
							
							
								
								Improve spec coverage for `api/web/push_subscriptions` controller ( #27858 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-11-15 13:14:51 +00:00  
				
					
						
							
							
								 
						
							
								b2c5b20ef2 
								
							 
						 
						
							
							
								
								Fix `RSpec/AnyInstance` cop ( #27810 )  
							
							
							
						 
						
							2023-11-14 14:52:59 +00:00  
				
					
						
							
							
								 
						
							
								49ba5a9f94 
								
							 
						 
						
							
							
								
								Use `hash_including` to check `AccountFilter` setup in `admin/accounts` controller spec ( #27838 )  
							
							
							
						 
						
							2023-11-13 16:01:24 +00:00  
				
					
						
							
							
								 
						
							
								a36b59be8a 
								
							 
						 
						
							
							
								
								Spec coverage for `api/v1/trends` controllers ( #27837 )  
							
							
							
						 
						
							2023-11-13 14:32:36 +00:00  
				
					
						
							
							
								 
						
							
								9dc3ce878b 
								
							 
						 
						
							
							
								
								Speed-up in `Settings::` controllers specs ( #27808 )  
							
							
							
						 
						
							2023-11-10 15:13:42 +00:00  
				
					
						
							
							
								 
						
							
								e79bf1b1e7 
								
							 
						 
						
							
							
								
								Minor speed improvement on `controllers/accounts` spec ( #27679 )  
							
							
							
						 
						
							2023-11-09 16:21:11 +00:00  
				
					
						
							
							
								 
						
							
								c451bbe249 
								
							 
						 
						
							
							
								
								Allow viewing and severing relationships with suspended accounts ( #27667 )  
							
							
							
						 
						
							2023-11-09 14:50:25 +00:00  
				
					
						
							
							
								 
						
							
								69d00e2721 
								
							 
						 
						
							
							
								
								Fix `RSpec/InstanceVariable` cop ( #27766 )  
							
							
							
						 
						
							2023-11-08 15:42:30 +00:00  
				
					
						
							
							
								 
						
							
								ce91d14d48 
								
							 
						 
						
							
							
								
								Fix `Style/WordArray` cop ( #27770 )  
							
							
							
						 
						
							2023-11-08 13:03:44 +00:00  
				
					
						
							
							
								 
						
							
								e545978076 
								
							 
						 
						
							
							
								
								Use framework helpers instead of i-vars in controller specs ( #27767 )  
							
							
							
						 
						
							2023-11-08 08:17:43 +00:00  
				
					
						
							
							
								 
						
							
								1d51e10510 
								
							 
						 
						
							
							
								
								Consolidate JSON parsing in serializers specs ( #27693 )  
							
							
							
						 
						
							2023-11-07 15:20:24 +00:00  
				
					
						
							
							
								 
						
							
								dc0bf87090 
								
							 
						 
						
							
							
								
								Remove unused before block from settings/branding spec ( #27759 )  
							
							
							
						 
						
							2023-11-07 15:19:17 +00:00  
				
					
						
							
							
								 
						
							
								49e2772064 
								
							 
						 
						
							
							
								
								Fix `RSpec/MessageSpies` cop ( #27751 )  
							
							
							
						 
						
							2023-11-07 09:46:28 +00:00  
				
					
						
							
							
								 
						
							
								cfa14ec6d1 
								
							 
						 
						
							
							
								
								Fix `Lint/EmptyBlock` cop ( #27748 )  
							
							
							
						 
						
							2023-11-07 09:11:04 +00:00  
				
					
						
							
							
								 
						
							
								b06284c572 
								
							 
						 
						
							
							
								
								Fix `RSpec/HookArgument` cop ( #27747 )  
							
							
							
						 
						
							2023-11-07 09:10:36 +00:00  
				
					
						
							
							
								 
						
							
								d6f50839e1 
								
							 
						 
						
							
							
								
								Fix `RSpec/SpecFilePathFormat` cops ( #27730 )  
							
							
							
						 
						
							2023-11-06 16:25:40 +00:00  
				
					
						
							
							
								 
						
							
								beee9ea991 
								
							 
						 
						
							
							
								
								Fix `RSpec/LetSetup` cop in spec/controllers/admin area ( #27619 )  
							
							
							
						 
						
							2023-10-31 08:22:19 +00:00  
				
					
						
							
							
								 
						
							
								2e6bf60f15 
								
							 
						 
						
							
							
								
								Use `deliveries.size` in mailer-related examples in controller specs ( #27589 )  
							
							
							
						 
						
							2023-10-27 15:33:52 +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  
				
					
						
							
							
								 
						
							
								e25cc4deb7 
								
							 
						 
						
							
							
								
								Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes. 
							
						 
						
							2023-10-24 19:31:14 +02:00  
				
					
						
							
							
								 
						
							
								26d2a2a0cc 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/media` ( #25543 )  
							
							
							
						 
						
							2023-10-23 15:46:21 +00:00  
				
					
						
							
							
								 
						
							
								74fd46d3ab 
								
							 
						 
						
							
							
								
								Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-19 19:14:04 +02:00  
				
					
						
							
							
								 
						
							
								9f218c9924 
								
							 
						 
						
							
							
								
								Refactor appeal partial to avoid brakeman XSS warning ( #25880 )  
							
							
							
						 
						
							2023-10-19 17:25:54 +02:00  
				
					
						
							
							
								 
						
							
								bcd0171e5e 
								
							 
						 
						
							
							
								
								Fix `Lint/UselessAssignment` cop ( #27472 )  
							
							
							
						 
						
							2023-10-19 16:55:06 +02:00  
				
					
						
							
							
								 
						
							
								c10a667ac2 
								
							 
						 
						
							
							
								
								Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-17 21:42:49 +02:00  
				
					
						
							
							
								 
						
							
								b867d4581e 
								
							 
						 
						
							
							
								
								Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`. 
							
						 
						
							2023-10-17 21:35:07 +02:00  
				
					
						
							
							
								 
						
							
								12bb7be8b5 
								
							 
						 
						
							
							
								
								Spec speed ups on `AccountsController` spec ( #25391 )  
							
							
							
						 
						
							2023-10-17 13:32:10 +02:00  
				
					
						
							
							
								 
						
							
								893b2f33fd 
								
							 
						 
						
							
							
								
								Extract shared example for cacheable response in specs ( #25388 )  
							
							
							
						 
						
							2023-10-16 17:52:06 +02:00  
				
					
						
							
							
								 
						
							
								708299bb0d 
								
							 
						 
						
							
							
								
								Misc coverage improvements for `Admin::` and `Settings::` controllers ( #25346 )  
							
							
							
						 
						
							2023-10-16 17:20:28 +02:00  
				
					
						
							
							
								 
						
							
								e0ed0f8c7c 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/notifications` ( #25553 )  
							
							
							
						 
						
							2023-10-16 17:15:24 +02:00  
				
					
						
							
							
								 
						
							
								cafdaec6cf 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/lists/:id/accounts` ( #25468 )  
							
							
							
						 
						
							2023-10-16 16:03:48 +02:00  
				
					
						
							
							
								 
						
							
								8e6116503d 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/blocks` ( #25517 )  
							
							
							
						 
						
							2023-10-16 16:03:35 +02:00  
				
					
						
							
							
								 
						
							
								d9caa6ed24 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/accounts` ( #25563 )  
							
							
							
						 
						
							2023-10-16 15:49:12 +02:00  
				
					
						
							
							
								 
						
							
								82beeb2f7e 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/trends/links` ( #25739 )  
							
							
							
						 
						
							2023-10-13 16:23:16 +02:00  
				
					
						
							
							
								 
						
							
								71cfdd7865 
								
							 
						 
						
							
							
								
								Fix duplicate tests ( #27395 )  
							
							
							
						 
						
							2023-10-13 16:10:43 +02:00  
				
					
						
							
							
								 
						
							
								bc6cd27d9e 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/followed_tags` ( #25472 )  
							
							
							
						 
						
							2023-10-13 14:43:50 +02:00  
				
					
						
							
							
								 
						
							
								fd9dea21d0 
								
							 
						 
						
							
							
								
								DB speedup in `API::` controller/request specs ( #25516 )  
							
							
							
						 
						
							2023-10-13 14:42:09 +02:00  
				
					
						
							
							
								 
						
							
								ecdb31d479 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/favourites` ( #25518 )  
							
							
							
						 
						
							2023-10-13 14:19:12 +02:00  
				
					
						
							
							
								 
						
							
								7664e3b692 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/statuses/:status_id/source` ( #25634 )  
							
							
							
						 
						
							2023-10-13 14:08:21 +02:00  
				
					
						
							
							
								 
						
							
								4230d1ee0a 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/timelines/tag/:hashtag` ( #25797 )  
							
							
							
						 
						
							2023-10-13 14:04:37 +02:00  
				
					
						
							
							
								 
						
							
								f546b0c999 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-19 17:07:29 +02:00  
				
					
						
							
							
								 
						
							
								94893cf24f 
								
							 
						 
						
							
							
								
								Merge pull request from GHSA-hcqf-fw2r-52g4  
							
							... 
							
							
							
							* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285 )"
This reverts commit 8891d8945d#26219 )"
This reverts commit fd284311e7 
							
						 
						
							2023-09-19 16:52:52 +02:00  
				
					
						
							
							
								 
						
							
								08b495d95c 
								
							 
						 
						
							
							
								
								Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-15 21:06:45 +02:00  
				
					
						
							
							
								 
						
							
								5d8c65f2a7 
								
							 
						 
						
							
							
								
								Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-15 20:57:40 +02:00  
				
					
						
							
							
								 
						
							
								81caafbe84 
								
							 
						 
						
							
							
								
								Fix performances of profile directory ( #26842 )  
							
							
							
						 
						
							2023-09-07 18:55:25 +02:00  
				
					
						
							
							
								 
						
							
								355e3fb529 
								
							 
						 
						
							
							
								
								Simplify `Account.by_recent_status` and `Account.by_recent_sign_in` scopes ( #26840 )  
							
							
							
						 
						
							2023-09-07 15:38:11 +02:00  
				
					
						
							
							
								 
						
							
								b83e487502 
								
							 
						 
						
							
							
								
								Fix moderator rights inconsistencies ( #26729 )  
							
							
							
						 
						
							2023-09-06 16:40:19 +02:00  
				
					
						
							
							
								 
						
							
								4adb12ca91 
								
							 
						 
						
							
							
								
								Fix test failures due to different default settings in glitch-soc  
							
							
							
						 
						
							2023-09-02 14:24:47 +02:00  
				
					
						
							
							
								 
						
							
								ac2dae0d11 
								
							 
						 
						
							
							
								
								Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did. 
							
						 
						
							2023-09-02 13:50:16 +02:00  
				
					
						
							
							
								 
						
							
								ccca542db1 
								
							 
						 
						
							
							
								
								Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled ( #26237 )  
							
							
							
						 
						
							2023-08-31 13:53:24 +02:00  
				
					
						
							
							
								 
						
							
								336ec503c2 
								
							 
						 
						
							
							
								
								Add avatar image to webfinger responses ( #26558 )  
							
							
							
						 
						
							2023-08-31 13:46:27 +02:00  
				
					
						
							
							
								 
						
							
								296b3d1560 
								
							 
						 
						
							
							
								
								Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change. 
							
						 
						
							2023-08-24 21:26:27 +02:00  
				
					
						
							
							
								 
						
							
								10404aece8 
								
							 
						 
						
							
							
								
								Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-22 18:50:14 +02:00  
				
					
						
							
							
								 
						
							
								b970ed6098 
								
							 
						 
						
							
							
								
								Update rubocop and rubocop-rspec ( #26329 )  
							
							
							
						 
						
							2023-08-22 09:31:40 +02:00  
				
					
						
							
							
								 
						
							
								60b9fa641d 
								
							 
						 
						
							
							
								
								Fix cached posts including stale stats ( #26409 )  
							
							
							
						 
						
							2023-08-17 16:11:48 +02:00  
				
					
						
							
							
								 
						
							
								44a5f1b64a 
								
							 
						 
						
							
							
								
								Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' 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  
				
					
						
							
							
								 
						
							
								fd284311e7 
								
							 
						 
						
							
							
								
								Do not normalize URL before fetching it ( #26219 )  
							
							
							
						 
						
							2023-07-31 23:17:37 +02:00  
				
					
						
							
							
								 
						
							
								92fa9d34b0 
								
							 
						 
						
							
							
								
								Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor. 
							
						 
						
							2023-07-30 16:11:55 +02:00  
				
					
						
							
							
								 
						
							
								454d8567d4 
								
							 
						 
						
							
							
								
								Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-30 15:54:34 +02:00  
				
					
						
							
							
								 
						
							
								993d0a9950 
								
							 
						 
						
							
							
								
								Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' 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  
				
					
						
							
							
								 
						
							
								b4e739ff0f 
								
							 
						 
						
							
							
								
								Change interaction modal in web UI ( #26075 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-07-27 16:11:17 +02:00  
				
					
						
							
							
								 
						
							
								812a84ff5f 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v2/filters` ( #25721 )  
							
							
							
						 
						
							2023-07-27 14:58:20 +02:00  
				
					
						
							
							
								 
						
							
								f48d345de1 
								
							 
						 
						
							
							
								
								Use correct naming on controller concern specs ( #26197 )  
							
							
							
						 
						
							2023-07-27 14:27:21 +02:00  
				
					
						
							
							
								 
						
							
								4c18928a93 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								c04f2d0cf7 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes. 
							
						 
						
							2023-07-17 19:02:23 +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  
				
					
						
							
							
								 
						
							
								d9adda1a99 
								
							 
						 
						
							
							
								
								Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 22:40:15 +02:00  
				
					
						
							
							
								 
						
							
								41f65edb21 
								
							 
						 
						
							
							
								
								Fix embed dropdown menu item for unauthenticated users ( #25964 )  
							
							
							
						 
						
							2023-07-13 15:53:03 +02:00  
				
					
						
							
							
								 
						
							
								9ae60f8738 
								
							 
						 
						
							
							
								
								Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file. 
							
						 
						
							2023-07-12 16:03:05 +02:00  
				
					
						
							
							
								 
						
							
								dd0002e1fe 
								
							 
						 
						
							
							
								
								Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes. 
							
						 
						
							2023-07-12 15:38:35 +02:00  
				
					
						
							
							
								 
						
							
								6c5a2233a8 
								
							 
						 
						
							
							
								
								Fix `RSpec/StubbedMock` cop ( #25552 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-12 10:20:10 +02:00  
				
					
						
							
							
								 
						
							
								658742b3cd 
								
							 
						 
						
							
							
								
								Fix `Lint/AmbiguousBlockAssociation` cop ( #25921 )  
							
							
							
						 
						
							2023-07-12 10:02:41 +02:00  
				
					
						
							
							
								 
						
							
								c75df62ccc 
								
							 
						 
						
							
							
								
								Fix `RSpec/SubjectDeclaration` cop ( #25312 )  
							
							
							
						 
						
							2023-07-12 09:49:33 +02:00  
				
					
						
							
							
								 
						
							
								cf33028f35 
								
							 
						 
						
							
							
								
								Admin mailer parameterization ( #25759 )  
							
							
							
						 
						
							2023-07-08 20:03:38 +02:00  
				
					
						
							
							
								 
						
							
								5de49e74d4 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-05 12:01:26 +02:00  
				
					
						
							
							
								 
						
							
								383c00819c 
								
							 
						 
						
							
							
								
								Fix `/api/v2/search` not working with following query param ( #25681 )  
							
							
							
						 
						
							2023-07-03 18:06:57 +02:00  
				
					
						
							
							
								 
						
							
								44e98a2740 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-02 11:49:08 +02:00  
				
					
						
							
							
								 
						
							
								4fe2d7cb59 
								
							 
						 
						
							
							
								
								Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )  
							
							
							
						 
						
							2023-07-02 00:05:44 +02:00  
				
					
						
							
							
								 
						
							
								683ba5ecb1 
								
							 
						 
						
							
							
								
								Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )  
							
							
							
						 
						
							2023-07-01 21:48:16 +02:00  
				
					
						
							
							
								 
						
							
								178e151019 
								
							 
						 
						
							
							
								
								Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars. 
							
						 
						
							2023-06-25 14:27:38 +02:00  
				
					
						
							
							
								 
						
							
								a5b6f6da80 
								
							 
						 
						
							
							
								
								Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )  
							
							
							
						 
						
							2023-06-22 14:56:14 +02:00  
				
					
						
							
							
								 
						
							
								05f9e39b32 
								
							 
						 
						
							
							
								
								Fix `RSpec/VerifiedDoubles` cop ( #25469 )  
							
							
							
						 
						
							2023-06-22 14:55:22 +02:00  
				
					
						
							
							
								 
						
							
								38433ccd0b 
								
							 
						 
						
							
							
								
								Reduce `Admin::Reports::Actions` spec db activity ( #25465 )  
							
							
							
						 
						
							2023-06-22 14:53:13 +02:00  
				
					
						
							
							
								 
						
							
								602c458ab6 
								
							 
						 
						
							
							
								
								Add finer permission requirements for managing webhooks ( #25463 )  
							
							
							
						 
						
							2023-06-22 14:52:25 +02:00  
				
					
						
							
							
								 
						
							
								63d15d5330 
								
							 
						 
						
							
							
								
								Speed-up on `StatusesController` spec ( #25549 )  
							
							
							
						 
						
							2023-06-22 14:51:53 +02:00  
				
					
						
							
							
								 
						
							
								6ac271c2a0 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/suggestions` ( #25540 )  
							
							
							
						 
						
							2023-06-22 11:49:35 +02:00  
				
					
						
							
							
								 
						
							
								ebfeaebedb 
								
							 
						 
						
							
							
								
								Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )  
							
							
							
						 
						
							2023-06-20 18:32:26 +02:00  
				
					
						
							
							
								 
						
							
								e53eb38a8d 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/account_actions` ( #25514 )  
							
							
							
						 
						
							2023-06-20 18:16:48 +02:00  
				
					
						
							
							
								 
						
							
								fd23f50243 
								
							 
						 
						
							
							
								
								Fix wrong view being displayed when a webhook fails validation ( #25464 )  
							
							
							
						 
						
							2023-06-20 18:15:35 +02:00  
				
					
						
							
							
								 
						
							
								e835198b26 
								
							 
						 
						
							
							
								
								Combine assertions in api/v1/notifications spec ( #25486 )  
							
							
							
						 
						
							2023-06-19 09:05:42 +02:00  
				
					
						
							
							
								 
						
							
								b9bc9d0bda 
								
							 
						 
						
							
							
								
								Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )  
							
							
							
						 
						
							2023-06-19 08:53:05 +02:00  
				
					
						
							
							
								 
						
							
								0a0a1f1495 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/tags` ( #25439 )  
							
							
							
						 
						
							2023-06-19 08:51:40 +02:00  
				
					
						
							
							
								 
						
							
								6c99479ef4 
								
							 
						 
						
							
							
								
								Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well. 
							
						 
						
							2023-06-18 13:41:33 +02:00  
				
					
						
							
							
								 
						
							
								65cbcce997 
								
							 
						 
						
							
							
								
								Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-18 10:36:14 +02:00  
				
					
						
							
							
								 
						
							
								b10c05e702 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/lists` ( #25443 )  
							
							
							
						 
						
							2023-06-15 10:19:51 +02:00  
				
					
						
							
							
								 
						
							
								4c5aa0e470 
								
							 
						 
						
							
							
								
								Update rubocop-rspec to version 2.22.0, fix `RSpec/IndexedLet` cop ( #24698 )  
							
							
							
						 
						
							2023-06-14 16:44:37 +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