a36b59be8a 
								
							 
						 
						
							
							
								
								Spec coverage for `api/v1/trends` controllers ( #27837 )  
							
							
							
						 
						
							2023-11-13 14:32:36 +00:00  
				
					
						
							
							
								 
						
							
								07a4059901 
								
							 
						 
						
							
							
								
								Add support for invite codes in the registration API ( #27805 )  
							
							
							
						 
						
							2023-11-13 13:27:00 +00:00  
				
					
						
							
							
								 
						
							
								0d14fcebae 
								
							 
						 
						
							
							
								
								Change link previews to keep original URL from the status ( #27312 )  
							
							
							
						 
						
							2023-11-13 09:58:28 +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  
				
					
						
							
							
								 
						
							
								548bb30b2a 
								
							 
						 
						
							
							
								
								Consolidate html page title output logic into helper ( #27563 )  
							
							
							
						 
						
							2023-11-09 13:05:57 +00:00  
				
					
						
							
							
								 
						
							
								63c9102f8a 
								
							 
						 
						
							
							
								
								Fix `RSpec/MessageChain` cop ( #27776 )  
							
							
							
						 
						
							2023-11-09 12:57:23 +00:00  
				
					
						
							
							
								 
						
							
								c9204b792c 
								
							 
						 
						
							
							
								
								Fix `Rails/I18nLocaleTexts` cop ( #27779 )  
							
							
							
						 
						
							2023-11-09 09:46:39 +00:00  
				
					
						
							
							
								 
						
							
								69d00e2721 
								
							 
						 
						
							
							
								
								Fix `RSpec/InstanceVariable` cop ( #27766 )  
							
							
							
						 
						
							2023-11-08 15:42:30 +00:00  
				
					
						
							
							
								 
						
							
								4329616c53 
								
							 
						 
						
							
							
								
								Ignore block result of `send` method and remove `rubocop:disable` in deepl spec ( #27741 )  
							
							
							
						 
						
							2023-11-08 14:43:17 +00:00  
				
					
						
							
							
								 
						
							
								b05575e242 
								
							 
						 
						
							
							
								
								Move RSpec config for streaming/search managers to be near classes ( #27761 )  
							
							
							
						 
						
							2023-11-08 13:04:17 +00:00  
				
					
						
							
							
								 
						
							
								ce91d14d48 
								
							 
						 
						
							
							
								
								Fix `Style/WordArray` cop ( #27770 )  
							
							
							
						 
						
							2023-11-08 13:03:44 +00:00  
				
					
						
							
							
								 
						
							
								c03bd2a238 
								
							 
						 
						
							
							
								
								Don't stub SUT in `FollowLimitValidator` spec ( #27760 )  
							
							
							
						 
						
							2023-11-08 12:49:46 +00:00  
				
					
						
							
							
								 
						
							
								9b7b4d748f 
								
							 
						 
						
							
							
								
								Simplify request cache spec shared examples ( #27673 )  
							
							
							
						 
						
							2023-11-08 12:37:29 +00:00  
				
					
						
							
							
								 
						
							
								23e32a4b30 
								
							 
						 
						
							
							
								
								Fix format-dependent redirects being cached regardless of requested format ( #27632 )  
							
							
							
						 
						
							2023-11-08 10:31:05 +00:00  
				
					
						
							
							
								 
						
							
								e545978076 
								
							 
						 
						
							
							
								
								Use framework helpers instead of i-vars in controller specs ( #27767 )  
							
							
							
						 
						
							2023-11-08 08:17:43 +00:00  
				
					
						
							
							
								 
						
							
								ee57bb4b44 
								
							 
						 
						
							
							
								
								Account statuses filter spec speedup ( #27674 )  
							
							
							
						 
						
							2023-11-07 15:47:01 +00:00  
				
					
						
							
							
								 
						
							
								ae7c20b00c 
								
							 
						 
						
							
							
								
								Move search and streaming spec manager classes to separate support files ( #27727 )  
							
							
							
						 
						
							2023-11-07 15:25:49 +00:00  
				
					
						
							
							
								 
						
							
								370802ce48 
								
							 
						 
						
							
							
								
								Add coverage for `CLI::Maintenance#fix_duplicates` command ( #25252 )  
							
							
							
						 
						
							2023-11-07 15:21:58 +00:00  
				
					
						
							
							
								 
						
							
								1d51e10510 
								
							 
						 
						
							
							
								
								Consolidate JSON parsing in serializers specs ( #27693 )  
							
							
							
						 
						
							2023-11-07 15:20:24 +00:00  
				
					
						
							
							
								 
						
							
								a688a9ed20 
								
							 
						 
						
							
							
								
								Use strings instead of numeric literals and remove `rubocop:disable` in cache spec ( #27742 )  
							
							
							
						 
						
							2023-11-07 15:20:00 +00:00  
				
					
						
							
							
								 
						
							
								dc0bf87090 
								
							 
						 
						
							
							
								
								Remove unused before block from settings/branding spec ( #27759 )  
							
							
							
						 
						
							2023-11-07 15:19:17 +00:00  
				
					
						
							
							
								 
						
							
								45770c9306 
								
							 
						 
						
							
							
								
								Fix `Performance/MapMethodChain` cop ( #27744 )  
							
							
							
						 
						
							2023-11-07 13:01:09 +00:00  
				
					
						
							
							
								 
						
							
								49e2772064 
								
							 
						 
						
							
							
								
								Fix `RSpec/MessageSpies` cop ( #27751 )  
							
							
							
						 
						
							2023-11-07 09:46:28 +00:00  
				
					
						
							
							
								 
						
							
								2862ad701f 
								
							 
						 
						
							
							
								
								Stub controller methods and remove `rubocop:disable` in captcha feature spec ( #27743 )  
							
							
							
						 
						
							2023-11-07 09:15:30 +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  
				
					
						
							
							
								 
						
							
								fe26f33e0a 
								
							 
						 
						
							
							
								
								Fix `Rails/RedundantActiveRecordAllMethod` cop ( #26885 )  
							
							
							
						 
						
							2023-11-06 15:51:52 +00:00  
				
					
						
							
							
								 
						
							
								949f5eb860 
								
							 
						 
						
							
							
								
								Fix `RSpec/MetadataStyle` cop in spec/ ( #27729 )  
							
							
							
						 
						
							2023-11-06 14:28:20 +00:00  
				
					
						
							
							
								 
						
							
								c0989b78f8 
								
							 
						 
						
							
							
								
								Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )  
							
							
							
						 
						
							2023-11-06 09:28:14 +00:00  
				
					
						
							
							
								 
						
							
								6712bf86cd 
								
							 
						 
						
							
							
								
								Fixes website not loading for unlogged users ( #27698 )  
							
							
							
						 
						
							2023-11-04 21:52:56 +00:00  
				
					
						
							
							
								 
						
							
								0337df3a42 
								
							 
						 
						
							
							
								
								Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )  
							
							
							
						 
						
							2023-11-02 14:58:37 +00:00  
				
					
						
							
							
								 
						
							
								d649bbf28f 
								
							 
						 
						
							
							
								
								Add some more tests and clean up domain block controller ( #27469 )  
							
							
							
						 
						
							2023-10-31 09:40:30 +00:00  
				
					
						
							
							
								 
						
							
								beee9ea991 
								
							 
						 
						
							
							
								
								Fix `RSpec/LetSetup` cop in spec/controllers/admin area ( #27619 )  
							
							
							
						 
						
							2023-10-31 08:22:19 +00:00  
				
					
						
							
							
								 
						
							
								eae5c7334a 
								
							 
						 
						
							
							
								
								Extract class from CSP configuration/initialization ( #26905 )  
							
							
							
						 
						
							2023-10-27 16:20:40 +00:00  
				
					
						
							
							
								 
						
							
								2e6bf60f15 
								
							 
						 
						
							
							
								
								Use `deliveries.size` in mailer-related examples in controller specs ( #27589 )  
							
							
							
						 
						
							2023-10-27 15:33:52 +00:00  
				
					
						
							
							
								 
						
							
								93e4cdc31b 
								
							 
						 
						
							
							
								
								Fix hashtag matching pattern matching some URLs ( #27584 )  
							
							
							
						 
						
							2023-10-27 14:04:51 +00:00  
				
					
						
							
							
								 
						
							
								1f5187e2e2 
								
							 
						 
						
							
							
								
								Misc spec/refactor to user mailer and user mailer spec ( #27486 )  
							
							
							
						 
						
							2023-10-27 09:57:16 +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  
				
					
						
							
							
								 
						
							
								8f998cd96a 
								
							 
						 
						
							
							
								
								Handle featured collections without items ( #27581 )  
							
							
							
						 
						
							2023-10-27 02:36:22 +00:00  
				
					
						
							
							
								 
						
							
								49b8433c56 
								
							 
						 
						
							
							
								
								Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )  
							
							
							
						 
						
							2023-10-25 21:33:44 +00:00  
				
					
						
							
							
								 
						
							
								4b0fb764c3 
								
							 
						 
						
							
							
								
								Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts and ported changes:
- updated `@rails/ujs` imports 
							
						 
						
							2023-10-24 19:59:19 +02: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  
				
					
						
							
							
								 
						
							
								787d5ad386 
								
							 
						 
						
							
							
								
								Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it. 
							
						 
						
							2023-10-24 19:05:18 +02:00  
				
					
						
							
							
								 
						
							
								b0c76eaadd 
								
							 
						 
						
							
							
								
								Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change. 
							
						 
						
							2023-10-24 18:41:20 +02:00  
				
					
						
							
							
								 
						
							
								e93a75f1a1 
								
							 
						 
						
							
							
								
								Rails 7.1 update ( #25963 )  
							
							
							
						 
						
							2023-10-23 17:58:29 +00:00  
				
					
						
							
							
								 
						
							
								26d2a2a0cc 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/media` ( #25543 )  
							
							
							
						 
						
							2023-10-23 15:46:21 +00:00  
				
					
						
							
							
								 
						
							
								bcae744275 
								
							 
						 
						
							
							
								
								Fix some link anchors being recognized as hashtags ( #27271 )  
							
							
							
						 
						
							2023-10-23 14:19:38 +02:00  
				
					
						
							
							
								 
						
							
								b0213472df 
								
							 
						 
						
							
							
								
								Validate allowed schemes on preview card URLs ( #27485 )  
							
							
							
						 
						
							2023-10-23 09:50:02 +02:00  
				
					
						
							
							
								 
						
							
								ab0fb81479 
								
							 
						 
						
							
							
								
								Configure brakeman to ignore url safe preview card urls ( #25883 )  
							
							
							
						 
						
							2023-10-20 15:32:16 +02:00  
				
					
						
							
							
								 
						
							
								13688539bc 
								
							 
						 
						
							
							
								
								Fix processing LDSigned activities from actors with unknown public keys ( #27474 )  
							
							
							
						 
						
							2023-10-20 10:45:46 +02: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  
				
					
						
							
							
								 
						
							
								7bc8f03162 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#migrate` ( #25284 )  
							
							
							
						 
						
							2023-10-19 16:11:15 +02:00  
				
					
						
							
							
								 
						
							
								a1b27d8b61 
								
							 
						 
						
							
							
								
								Fix `Naming/VariableNumber` cop ( #27447 )  
							
							
							
						 
						
							2023-10-18 14:26:22 +02:00  
				
					
						
							
							
								 
						
							
								7c3fea7275 
								
							 
						 
						
							
							
								
								Feature: Allow token introspection without read scope ( #27142 )  
							
							
							
						 
						
							2023-10-18 14:10:07 +02:00  
				
					
						
							
							
								 
						
							
								091a21e1bc 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#prune` ( #25204 )  
							
							
							
						 
						
							2023-10-18 10:20:50 +02:00  
				
					
						
							
							
								 
						
							
								e9dc30cdba 
								
							 
						 
						
							
							
								
								Fix duplicate github annotations for rspec failures ( #27450 )  
							
							
							
						 
						
							2023-10-18 10:18:34 +02:00  
				
					
						
							
							
								 
						
							
								63179f0bf4 
								
							 
						 
						
							
							
								
								Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-17 21:59:58 +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  
				
					
						
							
							
								 
						
							
								656a41db2a 
								
							 
						 
						
							
							
								
								Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system. 
							
						 
						
							2023-10-17 20:59:18 +02:00  
				
					
						
							
							
								 
						
							
								5ef26d8fd5 
								
							 
						 
						
							
							
								
								Add RSpec GitHub annotations gem ( #24040 )  
							
							
							
						 
						
							2023-10-17 18:28:09 +02:00  
				
					
						
							
							
								 
						
							
								71447ab19f 
								
							 
						 
						
							
							
								
								Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features/admin area ( #27445 )  
							
							
							
						 
						
							2023-10-17 16:57:19 +02:00  
				
					
						
							
							
								 
						
							
								2528a0721f 
								
							 
						 
						
							
							
								
								Update `rubocop-capybara` to version 2.19.0 ( #26982 )  
							
							
							
						 
						
							2023-10-17 16:10:50 +02:00  
				
					
						
							
							
								 
						
							
								b34a2b1b33 
								
							 
						 
						
							
							
								
								Fix errors in CLI specs ( #27399 )  
							
							
							
						 
						
							2023-10-17 15:30:12 +02:00  
				
					
						
							
							
								 
						
							
								c4bddc9855 
								
							 
						 
						
							
							
								
								Add spec for poll model ( #23399 )  
							
							... 
							
							
							
							Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-10-17 14:56:24 +02:00  
				
					
						
							
							
								 
						
							
								12bb7be8b5 
								
							 
						 
						
							
							
								
								Spec speed ups on `AccountsController` spec ( #25391 )  
							
							
							
						 
						
							2023-10-17 13:32:10 +02:00  
				
					
						
							
							
								 
						
							
								d54fec24e5 
								
							 
						 
						
							
							
								
								Add coverage for `CLI::PreviewCards#remove` command ( #27441 )  
							
							
							
						 
						
							2023-10-17 13:06:16 +02:00  
				
					
						
							
							
								 
						
							
								19900f647e 
								
							 
						 
						
							
							
								
								Add coverage for `UnreservedUsernameValidator` ( #25590 )  
							
							
							
						 
						
							2023-10-17 13:05:28 +02:00  
				
					
						
							
							
								 
						
							
								fc9ab61448 
								
							 
						 
						
							
							
								
								Expand spec coverage of `CLI::Media` ( #27437 )  
							
							
							
						 
						
							2023-10-16 18:20:58 +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  
				
					
						
							
							
								 
						
							
								f5bc1f20e2 
								
							 
						 
						
							
							
								
								Add coverage for `ExistingUsernameValidator` ( #25592 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-10-16 15:41:23 +02:00  
				
					
						
							
							
								 
						
							
								f8afa0f614 
								
							 
						 
						
							
							
								
								Remove unused stub json ld context ( #25454 )  
							
							
							
						 
						
							2023-10-16 15:38:27 +02:00  
				
					
						
							
							
								 
						
							
								00e92b4038 
								
							 
						 
						
							
							
								
								Add coverage for `CLI::Statuses` command ( #25321 )  
							
							
							
						 
						
							2023-10-16 15:37:22 +02:00  
				
					
						
							
							
								 
						
							
								299aa71c8f 
								
							 
						 
						
							
							
								
								Fix handling of `inLanguage` attribute in preview card processing ( #27423 )  
							
							
							
						 
						
							2023-10-16 15:24:14 +02:00  
				
					
						
							
							
								 
						
							
								82beeb2f7e 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/trends/links` ( #25739 )  
							
							
							
						 
						
							2023-10-13 16:23:16 +02:00  
				
					
						
							
							
								 
						
							
								1b195ce115 
								
							 
						 
						
							
							
								
								Speed-up on `Rack::Attack` spec ( #25542 )  
							
							
							
						 
						
							2023-10-13 16:14:23 +02:00  
				
					
						
							
							
								 
						
							
								71cfdd7865 
								
							 
						 
						
							
							
								
								Fix duplicate tests ( #27395 )  
							
							
							
						 
						
							2023-10-13 16:10:43 +02:00  
				
					
						
							
							
								 
						
							
								cad8cc90ba 
								
							 
						 
						
							
							
								
								Speed-up on `MoveWorker` spec ( #25528 )  
							
							
							
						 
						
							2023-10-13 15:50:46 +02:00  
				
					
						
							
							
								 
						
							
								058f73a4f5 
								
							 
						 
						
							
							
								
								Add request specs for `/api/v1/reports` ( #25475 )  
							
							
							
						 
						
							2023-10-13 15:30:40 +02:00  
				
					
						
							
							
								 
						
							
								abf0e1fa39 
								
							 
						 
						
							
							
								
								Move `SignedReqestHelpers` rspec config to separate file ( #25453 )  
							
							
							
						 
						
							2023-10-13 15:19:40 +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  
				
					
						
							
							
								 
						
							
								45bdd60f3c 
								
							 
						 
						
							
							
								
								Fix when unfollow a tag, my post also disappears from the home timeline ( #27391 )  
							
							
							
						 
						
							2023-10-13 11:15:47 +02:00  
				
					
						
							
							
								 
						
							
								133f218a4d 
								
							 
						 
						
							
							
								
								Add system specs for admin area `batch` actions ( #25027 )  
							
							
							
						 
						
							2023-10-13 10:42:59 +02:00  
				
					
						
							
							
								 
						
							
								3735e6f79d 
								
							 
						 
						
							
							
								
								Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-10 19:53:41 +02:00  
				
					
						
							
							
								 
						
							
								27e84c0691 
								
							 
						 
						
							
							
								
								Fix duplicate reports being sent when reporting some remote posts ( #27355 )  
							
							
							
						 
						
							2023-10-10 16:00:50 +02:00  
				
					
						
							
							
								 
						
							
								53f5b27bd1 
								
							 
						 
						
							
							
								
								Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-08 17:30:48 +02:00  
				
					
						
							
							
								 
						
							
								86c9c5afa0 
								
							 
						 
						
							
							
								
								Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes. 
							
						 
						
							2023-10-08 17:26:43 +02:00  
				
					
						
							
							
								 
						
							
								ac2370778a 
								
							 
						 
						
							
							
								
								Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes. 
							
						 
						
							2023-10-08 17:21:12 +02:00  
				
					
						
							
							
								 
						
							
								74c27e33e3 
								
							 
						 
						
							
							
								
								Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-08 17:10:39 +02:00  
				
					
						
							
							
								 
						
							
								3262d1f1b6 
								
							 
						 
						
							
							
								
								Fix incorrect serialization of regional languages in `contentMap` ( #27207 )  
							
							
							
						 
						
							2023-10-06 17:46:04 +02:00  
				
					
						
							
							
								 
						
							
								340c390849 
								
							 
						 
						
							
							
								
								Fix crash when filtering for “dormant” relationships ( #27306 )  
							
							
							
						 
						
							2023-10-06 12:58:16 +02:00  
				
					
						
							
							
								 
						
							
								40ba6e119b 
								
							 
						 
						
							
							
								
								Fix Vary headers not being set on some redirects ( #27272 )  
							
							
							
						 
						
							2023-10-05 09:50:08 +02:00  
				
					
						
							
							
								 
						
							
								72cec47c13 
								
							 
						 
						
							
							
								
								Silence deprecation warning in CacheBuster spec ( #27264 )  
							
							
							
						 
						
							2023-10-04 10:17:36 +02:00  
				
					
						
							
							
								 
						
							
								68ec1d180a 
								
							 
						 
						
							
							
								
								Fix language sorting in settings ( #27158 )  
							
							
							
						 
						
							2023-10-04 09:23:50 +02:00  
				
					
						
							
							
								 
						
							
								c676bc91e9 
								
							 
						 
						
							
							
								
								Dont match mention in url query string ( #25656 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-10-03 17:01:45 +02:00  
				
					
						
							
							
								 
						
							
								ceb365c419 
								
							 
						 
						
							
							
								
								Fix boosts of local users being filtered in account timelines ( #27204 )  
							
							
							
						 
						
							2023-10-03 12:21:42 +02:00  
				
					
						
							
							
								 
						
							
								f05985f8ec 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version. 
							
						 
						
							2023-09-21 15:12:00 +02:00  
				
					
						
							
							
								 
						
							
								828eebad48 
								
							 
						 
						
							
							
								
								Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API ( #26998 )  
							
							
							
						 
						
							2023-09-20 18:25:16 +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  
				
					
						
							
							
								 
						
							
								dfc05ec8df 
								
							 
						 
						
							
							
								
								Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes. 
							
						 
						
							2023-09-15 21:43:49 +02:00  
				
					
						
							
							
								 
						
							
								5ed72f668f 
								
							 
						 
						
							
							
								
								Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-15 21:39:21 +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  
				
					
						
							
							
								 
						
							
								6273416292 
								
							 
						 
						
							
							
								
								Fix post edits not being forwarded as expected ( #26936 )  
							
							
							
						 
						
							2023-09-15 19:54:32 +02:00  
				
					
						
							
							
								 
						
							
								20666482ef 
								
							 
						 
						
							
							
								
								Added admin api for managing tags ( #26872 )  
							
							
							
						 
						
							2023-09-13 11:22:53 +02:00  
				
					
						
							
							
								 
						
							
								4d9186a48c 
								
							 
						 
						
							
							
								
								Add search tests ( #26703 )  
							
							
							
						 
						
							2023-09-08 16:17:55 +02:00  
				
					
						
							
							
								 
						
							
								3a679844e4 
								
							 
						 
						
							
							
								
								Fix `account_id`, `max_id` and `min_id` params not working in search ( #26847 )  
							
							
							
						 
						
							2023-09-08 14:25:00 +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  
				
					
						
							
							
								 
						
							
								1f99d86287 
								
							 
						 
						
							
							
								
								Fix blocked domain appears from account feed ( #26823 )  
							
							... 
							
							
							
							Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-09-06 21:04:48 +02:00  
				
					
						
							
							
								 
						
							
								b83e487502 
								
							 
						 
						
							
							
								
								Fix moderator rights inconsistencies ( #26729 )  
							
							
							
						 
						
							2023-09-06 16:40:19 +02:00  
				
					
						
							
							
								 
						
							
								e66f961e05 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-04 18:27:46 +02:00  
				
					
						
							
							
								 
						
							
								ece1ff77d6 
								
							 
						 
						
							
							
								
								Add `in:library` syntax to search ( #26760 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-09-04 17:20:35 +02:00  
				
					
						
							
							
								 
						
							
								ea31929776 
								
							 
						 
						
							
							
								
								Fix invalid Content-Type header for WebP images ( #26773 )  
							
							
							
						 
						
							2023-09-04 09:46:33 +02:00  
				
					
						
							
							
								 
						
							
								c107512fa6 
								
							 
						 
						
							
							
								
								Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 15:02:29 +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  
				
					
						
							
							
								 
						
							
								c8aa3d6d06 
								
							 
						 
						
							
							
								
								Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 12:02:23 +02:00  
				
					
						
							
							
								 
						
							
								6b7c47311d 
								
							 
						 
						
							
							
								
								Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 11:41:40 +02:00  
				
					
						
							
							
								 
						
							
								16681e0f20 
								
							 
						 
						
							
							
								
								Add admin notifications for new Mastodon versions ( #26582 )  
							
							
							
						 
						
							2023-09-01 17:47:07 +02:00  
				
					
						
							
							
								 
						
							
								e754083e8a 
								
							 
						 
						
							
							
								
								Fix unmatched quotes and prefixes causing search to fail ( #26701 )  
							
							
							
						 
						
							2023-09-01 09:43:12 +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  
				
					
						
							
							
								 
						
							
								2304cc6456 
								
							 
						 
						
							
							
								
								Fix bad search type heuristic ( #26673 )  
							
							
							
						 
						
							2023-08-28 17:08:37 +02:00  
				
					
						
							
							
								 
						
							
								e3825a13c1 
								
							 
						 
						
							
							
								
								Add PublicStatusesCheck to Elasticsearch index check on admin dashboard ( #26650 )  
							
							
							
						 
						
							2023-08-25 12:01:55 +02:00  
				
					
						
							
							
								 
						
							
								32e67e78a3 
								
							 
						 
						
							
							
								
								Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-24 21:50:14 +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  
				
					
						
							
							
								 
						
							
								88ff45a3b2 
								
							 
						 
						
							
							
								
								Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-24 21:03:56 +02:00  
				
					
						
							
							
								 
						
							
								fbfc4145fd 
								
							 
						 
						
							
							
								
								Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there. 
							
						 
						
							2023-08-24 21:01:19 +02:00  
				
					
						
							
							
								 
						
							
								30c191aaa0 
								
							 
						 
						
							
							
								
								Add new public status index ( #26344 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-24 16:40:04 +02:00  
				
					
						
							
							
								 
						
							
								f337008819 
								
							 
						 
						
							
							
								
								Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` ( #26239 )  
							
							
							
						 
						
							2023-08-23 15:50:23 +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  
				
					
						
							
							
								 
						
							
								ac0eb0533e 
								
							 
						 
						
							
							
								
								Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )  
							
							
							
						 
						
							2023-08-21 16:50:22 +02:00  
				
					
						
							
							
								 
						
							
								191d302b7f 
								
							 
						 
						
							
							
								
								Refactor `Api::V1::ProfilesController` into two separate controllers ( #26573 )  
							
							
							
						 
						
							2023-08-21 15:47:09 +02:00  
				
					
						
							
							
								 
						
							
								d24a87ce4f 
								
							 
						 
						
							
							
								
								Add ability to delete avatar or header picture via the API ( #25124 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-21 08:44:35 +02:00  
				
					
						
							
							
								 
						
							
								b95867ad1f 
								
							 
						 
						
							
							
								
								Allow setting a custom HTTP method in CacheBuster ( #26528 )  
							
							... 
							
							
							
							Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com> 
							
						 
						
							2023-08-18 08:18:40 +02:00  
				
					
						
							
							
								 
						
							
								60b9fa641d 
								
							 
						 
						
							
							
								
								Fix cached posts including stale stats ( #26409 )  
							
							
							
						 
						
							2023-08-17 16:11:48 +02:00  
				
					
						
							
							
								 
						
							
								6530f9709c 
								
							 
						 
						
							
							
								
								Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore. 
							
						 
						
							2023-08-13 18:47:15 +02:00  
				
					
						
							
							
								 
						
							
								ea8802a05a 
								
							 
						 
						
							
							
								
								Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-12 09:36:38 +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  
				
					
						
							
							
								 
						
							
								d9a9323968 
								
							 
						 
						
							
							
								
								Avoid connecting to a running ES instance in ES search check spec ( #26413 )  
							
							
							
						 
						
							2023-08-09 13:15:04 +02:00  
				
					
						
							
							
								 
						
							
								2c88364222 
								
							 
						 
						
							
							
								
								Restore console behavior in `test` env ( #26401 )  
							
							
							
						 
						
							2023-08-09 11:26:56 +02:00  
				
					
						
							
							
								 
						
							
								b12d75ef4f 
								
							 
						 
						
							
							
								
								Fix blocking subdomains of an already-blocked domain ( #26392 )  
							
							
							
						 
						
							2023-08-09 09:39:36 +02:00  
				
					
						
							
							
								 
						
							
								30c64bf616 
								
							 
						 
						
							
							
								
								Fix list import concurrently creating lists of the same name ( #26372 )  
							
							
							
						 
						
							2023-08-07 17:59:20 +02:00  
				
					
						
							
							
								 
						
							
								c363978782 
								
							 
						 
						
							
							
								
								Spec media attachment speedups ( #25416 )  
							
							
							
						 
						
							2023-08-07 17:58:12 +02:00  
				
					
						
							
							
								 
						
							
								8da99ffb0d 
								
							 
						 
						
							
							
								
								Add alt text for preview card thumbnails ( #26184 )  
							
							
							
						 
						
							2023-08-03 15:41:51 +02:00  
				
					
						
							
							
								 
						
							
								3a4d3e9d4b 
								
							 
						 
						
							
							
								
								Add `GET /api/v1/instance/languages` to REST API ( #24443 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-03 11:25:47 +02:00  
				
					
						
							
							
								 
						
							
								e258b4cb64 
								
							 
						 
						
							
							
								
								Refactor: replace whitelist_mode mentions with limited_federation_mode ( #26252 )  
							
							
							
						 
						
							2023-08-02 19:32:48 +02:00  
				
					
						
							
							
								 
						
							
								8891d8945d 
								
							 
						 
						
							
							
								
								Fix request URL normalisation for bare domain and 8-bit characters ( #26285 )  
							
							
							
						 
						
							2023-08-02 19:32:29 +02:00  
				
					
						
							
							
								 
						
							
								ca342d4838 
								
							 
						 
						
							
							
								
								Add List-Unsubscribe email header ( #26085 )  
							
							
							
						 
						
							2023-08-01 19:34:40 +02:00  
				
					
						
							
							
								 
						
							
								f2257069b2 
								
							 
						 
						
							
							
								
								Fix AVIF attachments ( #26264 )  
							
							
							
						 
						
							2023-08-01 19:34:11 +02:00  
				
					
						
							
							
								 
						
							
								fd284311e7 
								
							 
						 
						
							
							
								
								Do not normalize URL before fetching it ( #26219 )  
							
							
							
						 
						
							2023-07-31 23:17:37 +02:00  
				
					
						
							
							
								 
						
							
								73a3228e0f 
								
							 
						 
						
							
							
								
								Fix CSP tests in glitch-soc  
							
							
							
						 
						
							2023-07-30 17:30:13 +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  
				
					
						
							
							
								 
						
							
								bd349cb850 
								
							 
						 
						
							
							
								
								Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns. 
							
						 
						
							2023-07-30 14:58:56 +02:00  
				
					
						
							
							
								 
						
							
								42f36aa55a 
								
							 
						 
						
							
							
								
								Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version. 
							
						 
						
							2023-07-30 13:49:35 +02:00  
				
					
						
							
							
								 
						
							
								7635c67450 
								
							 
						 
						
							
							
								
								Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change. 
							
						 
						
							2023-07-30 13:42:06 +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  
				
					
						
							
							
								 
						
							
								7581b1ff96 
								
							 
						 
						
							
							
								
								Profiling tools configuration improvement ( #25383 )  
							
							
							
						 
						
							2023-07-28 23:16:23 +02:00  
				
					
						
							
							
								 
						
							
								6f1fa1364f 
								
							 
						 
						
							
							
								
								Fix `RSpec/EmptyExampleGroup` cop ( #24735 )  
							
							
							
						 
						
							2023-07-28 23:15:33 +02:00  
				
					
						
							
							
								 
						
							
								660993b415 
								
							 
						 
						
							
							
								
								Add coverage for `URLValidator` ( #25591 )  
							
							
							
						 
						
							2023-07-28 23:12:25 +02:00  
				
					
						
							
							
								 
						
							
								6602edf064 
								
							 
						 
						
							
							
								
								Add coverage for `LanguageValidator` ( #25593 )  
							
							
							
						 
						
							2023-07-28 23:12:09 +02:00  
				
					
						
							
							
								 
						
							
								4d1b67f664 
								
							 
						 
						
							
							
								
								Add end-to-end (system) tests ( #25461 )  
							
							
							
						 
						
							2023-07-28 23:09:49 +02:00  
				
					
						
							
							
								 
						
							
								f96e4b3047 
								
							 
						 
						
							
							
								
								Use original URL in preview if it redirects to 4xx page ( #26200 )  
							
							
							
						 
						
							2023-07-28 23:02:08 +02:00  
				
					
						
							
							
								 
						
							
								6c3c5bbbc3 
								
							 
						 
						
							
							
								
								Fix crash when processing Flag activity with no status ( #26189 )  
							
							
							
						 
						
							2023-07-27 16:11:56 +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  
				
					
						
							
							
								 
						
							
								2d9808f648 
								
							 
						 
						
							
							
								
								Reformat large key values in service specs ( #26181 )  
							
							
							
						 
						
							2023-07-26 09:45:50 +02:00  
				
					
						
							
							
								 
						
							
								7d62e3b198 
								
							 
						 
						
							
							
								
								Reformat large text arg in `FetchLinkCardService` spec ( #26183 )  
							
							
							
						 
						
							2023-07-26 09:44:51 +02:00  
				
					
						
							
							
								 
						
							
								50ff3d3342 
								
							 
						 
						
							
							
								
								Coverage for `Auth::OmniauthCallbacks` controller ( #26147 )  
							
							
							
						 
						
							2023-07-25 09:46:57 +02:00  
				
					
						
							
							
								 
						
							
								5b457961fc 
								
							 
						 
						
							
							
								
								Fix linting issue ( #26106 )  
							
							
							
						 
						
							2023-07-21 14:21:10 +02:00  
				
					
						
							
							
								 
						
							
								e5f1000ad1 
								
							 
						 
						
							
							
								
								Fix CSP headers being unintendedly wide ( #26105 )  
							
							
							
						 
						
							2023-07-21 13:34:15 +02:00  
				
					
						
							
							
								 
						
							
								144a406d33 
								
							 
						 
						
							
							
								
								Clean up unused application records ( #24871 )  
							
							
							
						 
						
							2023-07-21 13:13:16 +02:00  
				
					
						
							
							
								 
						
							
								1e3b19230a 
								
							 
						 
						
							
							
								
								Add stricter protocol fields validation for accounts ( #25937 )  
							
							
							
						 
						
							2023-07-20 18:23:48 +02:00  
				
					
						
							
							
								 
						
							
								1cceb62afd 
								
							 
						 
						
							
							
								
								Fix `Lint/Void` cop ( #25922 )  
							
							
							
						 
						
							2023-07-20 17:31:34 +02:00  
				
					
						
							
							
								 
						
							
								285a3df56c 
								
							 
						 
						
							
							
								
								Move localized subject mailer shared example to separate file ( #25889 )  
							
							
							
						 
						
							2023-07-20 15:50:50 +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  
				
					
						
							
							
								 
						
							
								6edd404482 
								
							 
						 
						
							
							
								
								Cleanup unused portions of statuses/status partial ( #26045 )  
							
							
							
						 
						
							2023-07-19 08:44:16 +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  
				
					
						
							
							
								 
						
							
								943f27f437 
								
							 
						 
						
							
							
								
								Remove unfollowed hashtag posts from home feed ( #26028 )  
							
							
							
						 
						
							2023-07-17 13:56:28 +02:00  
				
					
						
							
							
								 
						
							
								f18618d7f9 
								
							 
						 
						
							
							
								
								Fix some incorrect tests ( #26035 )  
							
							
							
						 
						
							2023-07-17 13:13:43 +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  
				
					
						
							
							
								 
						
							
								075887e1d6 
								
							 
						 
						
							
							
								
								Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-12 15:44:33 +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  
				
					
						
							
							
								 
						
							
								82eebd0482 
								
							 
						 
						
							
							
								
								Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block. 
							
						 
						
							2023-07-12 15:27:32 +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  
				
					
						
							
							
								 
						
							
								74806deb2c 
								
							 
						 
						
							
							
								
								Fix `RSpec/SubjectStub` cop ( #25550 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-12 10:02:19 +02:00  
				
					
						
							
							
								 
						
							
								7824df0eca 
								
							 
						 
						
							
							
								
								Exclude `lib/linter` from simplecov report ( #25916 )  
							
							
							
						 
						
							2023-07-12 09:51:59 +02:00  
				
					
						
							
							
								 
						
							
								c75df62ccc 
								
							 
						 
						
							
							
								
								Fix `RSpec/SubjectDeclaration` cop ( #25312 )  
							
							
							
						 
						
							2023-07-12 09:49:33 +02:00  
				
					
						
							
							
								 
						
							
								1d557305d2 
								
							 
						 
						
							
							
								
								Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )  
							
							
							
						 
						
							2023-07-12 09:47:08 +02:00  
				
					
						
							
							
								 
						
							
								99be47f8b9 
								
							 
						 
						
							
							
								
								Change searching with # to include account index  ( #25638 )  
							
							
							
						 
						
							2023-07-10 20:58:13 +02:00  
				
					
						
							
							
								 
						
							
								c27b82a437 
								
							 
						 
						
							
							
								
								Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )  
							
							
							
						 
						
							2023-07-10 18:26:56 +02:00  
				
					
						
							
							
								 
						
							
								f3fca78756 
								
							 
						 
						
							
							
								
								Refactor `NotificationMailer` to use parameterization ( #25718 )  
							
							
							
						 
						
							2023-07-10 03:06:22 +02:00  
				
					
						
							
							
								 
						
							
								d6b387a0c4 
								
							 
						 
						
							
							
								
								Remove unused `NotificationMailer#digest` preview ( #25719 )  
							
							
							
						 
						
							2023-07-08 20:04:21 +02:00  
				
					
						
							
							
								 
						
							
								cf33028f35 
								
							 
						 
						
							
							
								
								Admin mailer parameterization ( #25759 )  
							
							
							
						 
						
							2023-07-08 20:03:38 +02:00  
				
					
						
							
							
								 
						
							
								93e8a15415 
								
							 
						 
						
							
							
								
								Add forwarding of reported replies to servers being replied to ( #25341 )  
							
							
							
						 
						
							2023-07-08 20:00:02 +02:00  
				
					
						
							
							
								 
						
							
								b9aa228c54 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version. 
							
						 
						
							2023-07-07 19:59:43 +02:00  
				
					
						
							
							
								 
						
							
								94fbac77e7 
								
							 
						 
						
							
							
								
								Fix processing of media files with unusual names ( #25788 )  
							
							
							
						 
						
							2023-07-07 13:35:22 +02:00  
				
					
						
							
							
								 
						
							
								ff7aae3037 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-06 15:16:34 +02:00  
				
					
						
							
							
								 
						
							
								dc8f1fbd97 
								
							 
						 
						
							
							
								
								Merge pull request from GHSA-9928-3cp5-93fm  
							
							... 
							
							
							
							* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged 
							
						 
						
							2023-07-06 15:05:05 +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  
				
					
						
							
							
								 
						
							
								a209d1e683 
								
							 
						 
						
							
							
								
								Fix ResolveURLService not resolving local URLs for remote content ( #25637 )  
							
							
							
						 
						
							2023-06-29 14:48:54 +02:00  
				
					
						
							
							
								 
						
							
								4581a528f7 
								
							 
						 
						
							
							
								
								Change account search to match by text when opted-in ( #25599 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-06-29 13:05:21 +02:00  
				
					
						
							
							
								 
						
							
								80a5c16ae1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-27 13:15:41 +02:00  
				
					
						
							
							
								 
						
							
								c7c6f02ae6 
								
							 
						 
						
							
							
								
								Fix suspending an already-limited domain ( #25603 )  
							
							
							
						 
						
							2023-06-27 12:32:51 +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  
				
					
						
							
							
								 
						
							
								0b39b9abee 
								
							 
						 
						
							
							
								
								Speed-up on `BackupService` spec ( #25527 )  
							
							
							
						 
						
							2023-06-22 11:53:28 +02:00  
				
					
						
							
							
								 
						
							
								6ac271c2a0 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/suggestions` ( #25540 )  
							
							
							
						 
						
							2023-06-22 11:49:35 +02:00  
				
					
						
							
							
								 
						
							
								37a9c2258a 
								
							 
						 
						
							
							
								
								Add per-test timeouts to AutoStatusesCleanupScheduler tests ( #24841 )  
							
							
							
						 
						
							2023-06-20 18:54:05 +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  
				
					
						
							
							
								 
						
							
								c78280a8ce 
								
							 
						 
						
							
							
								
								Add translate="no" to outgoing mentions and links ( #25524 )  
							
							
							
						 
						
							2023-06-20 18:10:19 +02:00  
				
					
						
							
							
								 
						
							
								eba3411bfa 
								
							 
						 
						
							
							
								
								Re-allow title attribute in <abbr> ( #2254 )  
							
							... 
							
							
							
							* Re-allow title attribute in <abbr>
This was accidentally removed in 7623e18124 
							
						 
						
							2023-06-19 18:01:35 +02:00  
				
					
						
							
							
								 
						
							
								dd07393e75 
								
							 
						 
						
							
							
								
								Fix user settings not getting validated ( #25508 )  
							
							
							
						 
						
							2023-06-19 14:06:06 +01:00  
				
					
						
							
							
								 
						
							
								e1c9d52e91 
								
							 
						 
						
							
							
								
								Reduce `sleep` time in request pool spec ( #25470 )  
							
							
							
						 
						
							2023-06-19 13:48:25 +02:00  
				
					
						
							
							
								 
						
							
								3a65fb044f 
								
							 
						 
						
							
							
								
								Add coverage for `UserMailer` methods ( #25484 )  
							
							
							
						 
						
							2023-06-19 09:50: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  
				
					
						
							
							
								 
						
							
								e5978184a6 
								
							 
						 
						
							
							
								
								Fix glitch-soc-only test being broken by refactor of the surrounding tests  
							
							
							
						 
						
							2023-06-18 13:59:47 +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  
				
					
						
							
							
								 
						
							
								b276b3bb83 
								
							 
						 
						
							
							
								
								Remove Ruby GC config from spec helper ( #25455 )  
							
							
							
						 
						
							2023-06-15 22:14:46 +01: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  
				
					
						
							
							
								 
						
							
								d9c6f70cc6 
								
							 
						 
						
							
							
								
								Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )  
							
							
							
						 
						
							2023-06-14 15:21:36 +02:00  
				
					
						
							
							
								 
						
							
								ae9f5379d1 
								
							 
						 
						
							
							
								
								Reduce factory data created in spec/models/trends/statuses spec ( #25410 )  
							
							
							
						 
						
							2023-06-14 09:57:06 +02:00  
				
					
						
							
							
								 
						
							
								31d5bc89d1 
								
							 
						 
						
							
							
								
								Speed improvement for `AccountsStatusesCleanupScheduler` spec ( #25406 )  
							
							
							
						 
						
							2023-06-14 09:56:11 +02:00  
				
					
						
							
							
								 
						
							
								a5b62e56d0 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/apps/verify_credentials` ( #25404 )  
							
							
							
						 
						
							2023-06-14 09:48:57 +02:00  
				
					
						
							
							
								 
						
							
								a6407aa662 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/apps` ( #25401 )  
							
							
							
						 
						
							2023-06-14 09:48:48 +02:00  
				
					
						
							
							
								 
						
							
								4c5f62de99 
								
							 
						 
						
							
							
								
								Extract shared examples from api specs ( #25387 )  
							
							
							
						 
						
							2023-06-14 09:34:01 +02:00  
				
					
						
							
							
								 
						
							
								ec59166844 
								
							 
						 
						
							
							
								
								Fix ArgumentError when loading newer Private Mentions ( #25399 )  
							
							
							
						 
						
							2023-06-14 08:54:52 +02:00  
				
					
						
							
							
								 
						
							
								10746af82f 
								
							 
						 
						
							
							
								
								Remove unused shared examples for scoped settings ( #25389 )  
							
							
							
						 
						
							2023-06-13 14:59:04 +02:00  
				
					
						
							
							
								 
						
							
								25c66fa640 
								
							 
						 
						
							
							
								
								Enable paperclip for account attachment examples ( #25381 )  
							
							
							
						 
						
							2023-06-12 17:37:43 +02:00  
				
					
						
							
							
								 
						
							
								42a0898f16 
								
							 
						 
						
							
							
								
								Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here. 
							
						 
						
							2023-06-10 18:42:29 +02:00  
				
					
						
							
							
								 
						
							
								62c996b52d 
								
							 
						 
						
							
							
								
								Reduce `RSpec/MultipleExpectations` cop max to 8 ( #25313 )  
							
							
							
						 
						
							2023-06-10 18:38:22 +02:00  
				
					
						
							
							
								 
						
							
								b5675e265e 
								
							 
						 
						
							
							
								
								Add coverage for `CLI::Feeds` command ( #25319 )  
							
							
							
						 
						
							2023-06-10 18:37:36 +02:00  
				
					
						
							
							
								 
						
							
								07933db788 
								
							 
						 
						
							
							
								
								Add coverage for `CLI::Cache` command ( #25238 )  
							
							
							
						 
						
							2023-06-10 18:36:09 +02:00  
				
					
						
							
							
								 
						
							
								b19a695608 
								
							 
						 
						
							
							
								
								migrate test for `GET /api/v1/accounts/{account_id}` to request spec ( #25322 )  
							
							
							
						 
						
							2023-06-10 18:33:24 +02:00  
				
					
						
							
							
								 
						
							
								99216e34e5 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/canonical_email_blocks` ( #25330 )  
							
							
							
						 
						
							2023-06-10 18:33:02 +02:00  
				
					
						
							
							
								 
						
							
								b4e19f9610 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/ip_blocks` ( #25331 )  
							
							
							
						 
						
							2023-06-10 18:32:46 +02:00  
				
					
						
							
							
								 
						
							
								4301d8cbb3 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/domain_allows` ( #25333 )  
							
							
							
						 
						
							2023-06-10 18:32:26 +02:00  
				
					
						
							
							
								 
						
							
								841c220c40 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/domain_blocks` ( #25335 )  
							
							
							
						 
						
							2023-06-10 18:32:07 +02:00  
				
					
						
							
							
								 
						
							
								0e200d4e2f 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/reports` ( #25355 )  
							
							
							
						 
						
							2023-06-10 18:30:43 +02:00  
				
					
						
							
							
								 
						
							
								3a2a15c6ea 
								
							 
						 
						
							
							
								
								Use `build` where possible in fabricators ( #25360 )  
							
							
							
						 
						
							2023-06-10 18:29:01 +02:00  
				
					
						
							
							
								 
						
							
								c94bb9ba9a 
								
							 
						 
						
							
							
								
								Disable paperclip processing in specs ( #25359 )  
							
							
							
						 
						
							2023-06-10 18:27:35 +02:00  
				
					
						
							
							
								 
						
							
								8c26d49cbd 
								
							 
						 
						
							
							
								
								Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument. 
							
						 
						
							2023-06-10 17:18:36 +02:00  
				
					
						
							
							
								 
						
							
								c48ec9cb8c 
								
							 
						 
						
							
							
								
								Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug. 
							
						 
						
							2023-06-10 16:48:01 +02:00  
				
					
						
							
							
								 
						
							
								d8b0a732aa 
								
							 
						 
						
							
							
								
								Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components. 
							
						 
						
							2023-06-10 16:22:14 +02:00  
				
					
						
							
							
								 
						
							
								734e186717 
								
							 
						 
						
							
							
								
								Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/load_locale.js`:
  The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
  Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
  The file moved to `app/javascript/mastodon/locales/index.ts`.
  Did *not* port the changes as I want to try something a bit different. 
							
						 
						
							2023-06-10 15:32:29 +02:00  
				
					
						
							
							
								 
						
							
								aa57f7e3e2 
								
							 
						 
						
							
							
								
								Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-10 15:17:08 +02:00  
				
					
						
							
							
								 
						
							
								b27a9a5903 
								
							 
						 
						
							
							
								
								Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-10 15:09:19 +02:00  
				
					
						
							
							
								 
						
							
								93c714417f 
								
							 
						 
						
							
							
								
								Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`. 
							
						 
						
							2023-06-10 14:38:04 +02:00  
				
					
						
							
							
								 
						
							
								4aff1d2974 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/admin/email_domain_blocks` ( #25337 )  
							
							
							
						 
						
							2023-06-09 14:00:14 +02:00  
				
					
						
							
							
								 
						
							
								6c0e3f490a 
								
							 
						 
						
							
							
								
								Fix RSpec/MissingExampleGroupArgument cop ( #25310 )  
							
							
							
						 
						
							2023-06-06 15:51:42 +02:00  
				
					
						
							
							
								 
						
							
								b74c3cd708 
								
							 
						 
						
							
							
								
								Fix `RSpec/DescribedClass` cop missed items ( #25309 )  
							
							
							
						 
						
							2023-06-06 14:51:03 +02:00  
				
					
						
							
							
								 
						
							
								c42591356d 
								
							 
						 
						
							
							
								
								Fix `RSpec/DescribedClass` cop ( #25104 )  
							
							
							
						 
						
							2023-06-06 13:58:33 +02:00  
				
					
						
							
							
								 
						
							
								1e243e2df7 
								
							 
						 
						
							
							
								
								Misc spec coverage for `Admin::` area controllers ( #25282 )  
							
							
							
						 
						
							2023-06-06 13:57:00 +02:00  
				
					
						
							
							
								 
						
							
								eb6f8181e1 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#reset_relationships` ( #25194 )  
							
							
							
						 
						
							2023-06-06 13:37:09 +02:00  
				
					
						
							
							
								 
						
							
								b22bfae4f9 
								
							 
						 
						
							
							
								
								Add coverage for `DomainBlock#public_domain` method ( #25283 )  
							
							
							
						 
						
							2023-06-06 13:34:04 +02:00  
				
					
						
							
							
								 
						
							
								4eda233e09 
								
							 
						 
						
							
							
								
								Add webhook templating ( #23289 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-06 10:42:47 +02:00  
				
					
						
							
							
								 
						
							
								af135bddd0 
								
							 
						 
						
							
							
								
								Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )  
							
							
							
						 
						
							2023-06-05 20:46:04 +02:00  
				
					
						
							
							
								 
						
							
								3b21c13dcc 
								
							 
						 
						
							
							
								
								Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )  
							
							
							
						 
						
							2023-06-05 16:52:33 +02:00  
				
					
						
							
							
								 
						
							
								70cd2d6000 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#cull` ( #25250 )  
							
							
							
						 
						
							2023-06-05 14:51:25 +02:00  
				
					
						
							
							
								 
						
							
								c22fc2fa80 
								
							 
						 
						
							
							
								
								Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes. 
							
						 
						
							2023-06-05 13:25:22 +02:00  
				
					
						
							
							
								 
						
							
								bacb674921 
								
							 
						 
						
							
							
								
								Add exclusive lists ( #22048 )  
							
							... 
							
							
							
							Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-05 09:37:02 +02:00  
				
					
						
							
							
								 
						
							
								5c87c66504 
								
							 
						 
						
							
							
								
								Add coverage for CLI::CanonicalEmailBlocks command ( #25239 )  
							
							
							
						 
						
							2023-06-05 08:20:18 +02:00  
				
					
						
							
							
								 
						
							
								03a707f6a6 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#merge` ( #25199 )  
							
							
							
						 
						
							2023-06-05 08:16:12 +02:00  
				
					
						
							
							
								 
						
							
								b0780cfeed 
								
							 
						 
						
							
							
								
								Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )  
							
							
							
						 
						
							2023-06-02 15:00:27 +02:00  
				
					
						
							
							
								 
						
							
								8884d1ece0 
								
							 
						 
						
							
							
								
								Add support for importing lists ( #25203 )  
							
							
							
						 
						
							2023-06-01 14:47:31 +02:00  
				
					
						
							
							
								 
						
							
								2a353200ad 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#rotate` ( #25212 )  
							
							
							
						 
						
							2023-06-01 14:29:29 +02:00  
				
					
						
							
							
								 
						
							
								942d850b0a 
								
							 
						 
						
							
							
								
								Allow carets in URL search params ( #25216 )  
							
							
							
						 
						
							2023-06-01 12:14:49 +02:00  
				
					
						
							
							
								 
						
							
								f906e21a4f 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#refresh` ( #25196 )  
							
							
							
						 
						
							2023-06-01 10:01:09 +02:00  
				
					
						
							
							
								 
						
							
								f84037ae2b 
								
							 
						 
						
							
							
								
								Remove unused #hash_to_object method in SettingsHelper ( #25213 )  
							
							
							
						 
						
							2023-06-01 09:47:05 +02:00  
				
					
						
							
							
								 
						
							
								e9385e93e9 
								
							 
						 
						
							
							
								
								Add a confirmation screen when suspending a domain ( #25144 )  
							
							
							
						 
						
							2023-06-01 09:37:38 +02:00  
				
					
						
							
							
								 
						
							
								b922ad7a1b 
								
							 
						 
						
							
							
								
								Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )  
							
							
							
						 
						
							2023-06-01 09:23:28 +02:00  
				
					
						
							
							
								 
						
							
								69057467cb 
								
							 
						 
						
							
							
								
								Translate CW, poll options and media descriptions ( #24175 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-01 00:10:21 +02:00  
				
					
						
							
							
								 
						
							
								b0104e4c33 
								
							 
						 
						
							
							
								
								Silence output to stdout during cli specs ( #25211 )  
							
							
							
						 
						
							2023-05-31 20:01:11 +02:00  
				
					
						
							
							
								 
						
							
								3c41547f49 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#backup` ( #25163 )  
							
							
							
						 
						
							2023-05-31 15:32:37 +02:00  
				
					
						
							
							
								 
						
							
								8b1bfaed3e 
								
							 
						 
						
							
							
								
								Add specs for admin/webhooks CRUD actions ( #25133 )  
							
							
							
						 
						
							2023-05-31 15:23:49 +02:00  
				
					
						
							
							
								 
						
							
								665bb237a8 
								
							 
						 
						
							
							
								
								Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules ( #25192 )  
							
							
							
						 
						
							2023-05-31 10:23:32 +02:00  
				
					
						
							
							
								 
						
							
								bf9a7ce8e8 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#unfollow` ( #25162 )  
							
							
							
						 
						
							2023-05-31 09:33:57 +02:00  
				
					
						
							
							
								 
						
							
								dbc44be0ca 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#follow` ( #25161 )  
							
							
							
						 
						
							2023-05-30 16:13:29 +02:00  
				
					
						
							
							
								 
						
							
								3d253b9830 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#approve` ( #25160 )  
							
							
							
						 
						
							2023-05-30 15:00:21 +02:00  
				
					
						
							
							
								 
						
							
								bbbcdc083f 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#delete` ( #25146 )  
							
							
							
						 
						
							2023-05-30 11:59:17 +02:00  
				
					
						
							
							
								 
						
							
								bdc7548652 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#modify` ( #25145 )  
							
							
							
						 
						
							2023-05-29 15:31:59 +02:00  
				
					
						
							
							
								 
						
							
								11b8336418 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::CLI::Accounts#create` ( #25143 )  
							
							
							
						 
						
							2023-05-29 11:43:19 +02:00  
				
					
						
							
							
								 
						
							
								0669783da8 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-28 17:01:25 +02:00  
				
					
						
							
							
								 
						
							
								0e7466717f 
								
							 
						 
						
							
							
								
								Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted. 
							
						 
						
							2023-05-28 16:41:14 +02:00  
				
					
						
							
							
								 
						
							
								6dbd44faea 
								
							 
						 
						
							
							
								
								Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-28 15:01:53 +02:00  
				
					
						
							
							
								 
						
							
								0f2c16ac4b 
								
							 
						 
						
							
							
								
								Fix RSpec/NoExpectationExample cop ( #25103 )  
							
							
							
						 
						
							2023-05-26 09:41:12 +02:00  
				
					
						
							
							
								 
						
							
								61f6cd45e3 
								
							 
						 
						
							
							
								
								Fix glitch-soc-only tests being broken because of test refactor  
							
							
							
						 
						
							2023-05-26 00:10:57 +02:00  
				
					
						
							
							
								 
						
							
								e2ab9d4dad 
								
							 
						 
						
							
							
								
								Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 23:47:28 +02:00  
				
					
						
							
							
								 
						
							
								2e02d03524 
								
							 
						 
						
							
							
								
								Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 22:59:30 +02:00  
				
					
						
							
							
								 
						
							
								f959f6cdbb 
								
							 
						 
						
							
							
								
								Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 22:18:55 +02:00  
				
					
						
							
							
								 
						
							
								b735954971 
								
							 
						 
						
							
							
								
								Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc. 
							
						 
						
							2023-05-25 20:43:25 +02:00  
				
					
						
							
							
								 
						
							
								384345b0de 
								
							 
						 
						
							
							
								
								Add CLI Base class for command line code ( #25106 )  
							
							
							
						 
						
							2023-05-24 11:55:40 +02:00  
				
					
						
							
							
								 
						
							
								d2e5430d4a 
								
							 
						 
						
							
							
								
								Fix RSpec/ExpectChange cop ( #25101 )  
							
							
							
						 
						
							2023-05-24 11:23:40 +02:00  
				
					
						
							
							
								 
						
							
								b896b16cb3 
								
							 
						 
						
							
							
								
								Fix RSpec/PredicateMatcher cop ( #25102 )  
							
							
							
						 
						
							2023-05-23 16:49:11 +02:00  
				
					
						
							
							
								 
						
							
								778e4a7bf7 
								
							 
						 
						
							
							
								
								Fix RSpec/ExpectInHook cop ( #25100 )  
							
							
							
						 
						
							2023-05-23 16:40:21 +02:00  
				
					
						
							
							
								 
						
							
								b6b4ea4ca5 
								
							 
						 
						
							
							
								
								Move the mastodon/*_cli files to mastodon/cli/* ( #24139 )  
							
							
							
						 
						
							2023-05-23 16:08:26 +02:00  
				
					
						
							
							
								 
						
							
								c9f980b268 
								
							 
						 
						
							
							
								
								Add request spec for backups download ( #25099 )  
							
							
							
						 
						
							2023-05-23 15:44:11 +02:00  
				
					
						
							
							
								 
						
							
								e387175fc9 
								
							 
						 
						
							
							
								
								Fix RSpec/RepeatedExample cop ( #24849 )  
							
							
							
						 
						
							2023-05-23 10:49:23 +02:00  
				
					
						
							
							
								 
						
							
								9f5deb310b 
								
							 
						 
						
							
							
								
								Fix Performance/MapCompact cop ( #24797 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-05-23 10:49:12 +02:00  
				
					
						
							
							
								 
						
							
								2877c80dbc 
								
							 
						 
						
							
							
								
								Add specs for admin/announcements CRUD actions ( #25077 )  
							
							
							
						 
						
							2023-05-23 10:03:51 +02:00  
				
					
						
							
							
								 
						
							
								b473df9a14 
								
							 
						 
						
							
							
								
								Improve test coverage for `/api/v1/featured_tags` ( #25076 )  
							
							
							
						 
						
							2023-05-23 09:01:11 +02:00  
				
					
						
							
							
								 
						
							
								2a61f14753 
								
							 
						 
						
							
							
								
								Fix account confirmation flow not returning to app after captcha validation ( #25057 )  
							
							
							
						 
						
							2023-05-22 17:38:05 +02:00  
				
					
						
							
							
								 
						
							
								4a22e72b9b 
								
							 
						 
						
							
							
								
								Improve test coverage for `/api/v1/admin/canonical_email_blocks` ( #24985 )  
							
							
							
						 
						
							2023-05-22 15:27:35 +02:00  
				
					
						
							
							
								 
						
							
								ce8b5899ae 
								
							 
						 
						
							
							
								
								Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified ( #24958 )  
							
							
							
						 
						
							2023-05-22 13:44:49 +02:00  
				
					
						
							
							
								 
						
							
								e328ab7e5a 
								
							 
						 
						
							
							
								
								Implement pending specs for StatusesController ( #23969 )  
							
							
							
						 
						
							2023-05-22 13:43:05 +02:00  
				
					
						
							
							
								 
						
							
								f3feb4c891 
								
							 
						 
						
							
							
								
								Improve test coverage for `/api/v1/admin/email_domain_blocks` ( #25017 )  
							
							
							
						 
						
							2023-05-22 13:28:11 +02:00  
				
					
						
							
							
								 
						
							
								19f9098551 
								
							 
						 
						
							
							
								
								Allow reports with long comments from remote instances, but truncate ( #25028 )  
							
							
							
						 
						
							2023-05-22 13:15:21 +02:00  
				
					
						
							
							
								 
						
							
								d51464283c 
								
							 
						 
						
							
							
								
								Improve test coverage for `/api/v1/admin/ip_blocks_controller` ( #25031 )  
							
							
							
						 
						
							2023-05-22 12:50:44 +02:00  
				
					
						
							
							
								 
						
							
								99e2e9b81f 
								
							 
						 
						
							
							
								
								Fix minor typos in comments and spec names ( #21831 )  
							
							
							
						 
						
							2023-05-19 17:13:29 +02:00  
				
					
						
							
							
								 
						
							
								b805b7f021 
								
							 
						 
						
							
							
								
								Add tests for avatar/header in backup service ( #25037 )  
							
							
							
						 
						
							2023-05-19 12:04:18 +02:00  
				
					
						
							
							
								 
						
							
								d34d94d08f 
								
							 
						 
						
							
							
								
								Add spec for migration warning module ( #25033 )  
							
							
							
						 
						
							2023-05-19 10:53:50 +02:00  
				
					
						
							
							
								 
						
							
								e60414792d 
								
							 
						 
						
							
							
								
								Add polling and automatic redirection to `/start` on email confirmation ( #25013 )  
							
							
							
						 
						
							2023-05-16 18:03:52 +02:00  
				
					
						
							
							
								 
						
							
								3ed3d54bf3 
								
							 
						 
						
							
							
								
								Fix reports not being closed when performing batch suspensions ( #24988 )  
							
							
							
						 
						
							2023-05-16 14:56:49 +02:00  
				
					
						
							
							
								 
						
							
								604e1c2b11 
								
							 
						 
						
							
							
								
								Remove usage of random sample values in specs ( #24869 )  
							
							
							
						 
						
							2023-05-15 20:20:13 +02:00  
				
					
						
							
							
								 
						
							
								b84bc2de5d 
								
							 
						 
						
							
							
								
								Replace i18n view spec with helper spec ( #24966 )  
							
							
							
						 
						
							2023-05-15 17:25:04 +02:00  
				
					
						
							
							
								 
						
							
								679aca46da 
								
							 
						 
						
							
							
								
								I18n pluralization errors ( #24963 )  
							
							
							
						 
						
							2023-05-12 18:53:30 +02:00  
				
					
						
							
							
								 
						
							
								433ab0c9a3 
								
							 
						 
						
							
							
								
								Fix uncaught NoMethodError error in `/api/v1/admin/canonical_email_blocks/test` ( #24947 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-05-12 13:46:16 +02:00  
				
					
						
							
							
								 
						
							
								9015c2d646 
								
							 
						 
						
							
							
								
								Change profile updates to be sent to recently-mentioned servers ( #24852 )  
							
							
							
						 
						
							2023-05-12 13:13:04 +02:00  
				
					
						
							
							
								 
						
							
								2c2d924942 
								
							 
						 
						
							
							
								
								Fix RSpec/RepeatedExampleGroupDescription cop ( #24850 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-05-12 12:25:32 +02:00  
				
					
						
							
							
								 
						
							
								bf3ebeb42f 
								
							 
						 
						
							
							
								
								Fix RSpec/SharedContext cop ( #24847 )  
							
							
							
						 
						
							2023-05-12 09:25:43 +02:00  
				
					
						
							
							
								 
						
							
								a610a02d4f 
								
							 
						 
						
							
							
								
								Fix RSpec/ScatteredSetup cop ( #24848 )  
							
							
							
						 
						
							2023-05-11 10:32:09 +02:00  
				
					
						
							
							
								 
						
							
								9cbda99941 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::IpBlocksCLI` ( #24935 )  
							
							
							
						 
						
							2023-05-11 10:19:24 +02:00  
				
					
						
							
							
								 
						
							
								6b0942d107 
								
							 
						 
						
							
							
								
								Change AccessTokensVacuum to also delete expired tokens ( #24868 )  
							
							
							
						 
						
							2023-05-11 04:40:03 +02:00  
				
					
						
							
							
								 
						
							
								8b31030fe4 
								
							 
						 
						
							
							
								
								Fix rubocop issues in glitch-soc-specific code  
							
							
							
						 
						
							2023-05-08 19:28:43 +02:00  
				
					
						
							
							
								 
						
							
								d77fbbed73 
								
							 
						 
						
							
							
								
								Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests. 
							
						 
						
							2023-05-08 19:28:21 +02:00  
				
					
						
							
							
								 
						
							
								2d029dedd9 
								
							 
						 
						
							
							
								
								Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes. 
							
						 
						
							2023-05-08 15:28:36 +02:00  
				
					
						
							
							
								 
						
							
								c9210af3ee 
								
							 
						 
						
							
							
								
								Add test coverage for `Mastodon::SettingsCLI` ( #24856 )  
							
							
							
						 
						
							2023-05-04 20:37:42 +02:00  
				
					
						
							
							
								 
						
							
								c3c7d59072 
								
							 
						 
						
							
							
								
								Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )  
							
							
							
						 
						
							2023-05-04 10:13:00 +02:00  
				
					
						
							
							
								 
						
							
								da3bd913ae 
								
							 
						 
						
							
							
								
								Autofix Rubocop Style/HashSyntax ( #23754 )  
							
							
							
						 
						
							2023-05-04 05:54:26 +02:00  
				
					
						
							
							
								 
						
							
								1fe04f740a 
								
							 
						 
						
							
							
								
								Enable Rubocop Rails/FilePath ( #23854 )  
							
							
							
						 
						
							2023-05-04 05:50:40 +02:00  
				
					
						
							
							
								 
						
							
								c97b611b6b 
								
							 
						 
						
							
							
								
								Fix RSpec/InferredSpecType cop ( #24736 )  
							
							
							
						 
						
							2023-05-04 05:49:53 +02:00  
				
					
						
							
							
								 
						
							
								710745e16b 
								
							 
						 
						
							
							
								
								Fix RSpec/ContextWording cop ( #24739 )  
							
							
							
						 
						
							2023-05-04 05:49:08 +02:00  
				
					
						
							
							
								 
						
							
								cf18cc2891 
								
							 
						 
						
							
							
								
								Fix RSpec/MultipleSubjects cop ( #24738 )  
							
							
							
						 
						
							2023-05-04 05:48:35 +02:00  
				
					
						
							
							
								 
						
							
								bdcd8a9e88 
								
							 
						 
						
							
							
								
								Misc spec cleanup ( #24822 )  
							
							
							
						 
						
							2023-05-04 05:47:52 +02:00  
				
					
						
							
							
								 
						
							
								08fb9d300a 
								
							 
						 
						
							
							
								
								Spec coverage for settings/preferences/* controllers ( #24825 )  
							
							
							
						 
						
							2023-05-04 05:44:27 +02:00  
				
					
						
							
							
								 
						
							
								a2a22bad23 
								
							 
						 
						
							
							
								
								Fix various edge cases with local moves ( #24812 )  
							
							
							
						 
						
							2023-05-03 19:19:25 +02:00  
				
					
						
							
							
								 
						
							
								1e75eb690d 
								
							 
						 
						
							
							
								
								Fix own posts not getting delivered to own lists ( #24810 )  
							
							
							
						 
						
							2023-05-03 19:17:40 +02:00  
				
					
						
							
							
								 
						
							
								c98b012583 
								
							 
						 
						
							
							
								
								Change Move handler to also move list memberships ( #24808 )  
							
							
							
						 
						
							2023-05-03 14:03:38 +02:00  
				
					
						
							
							
								 
						
							
								3df665fd23 
								
							 
						 
						
							
							
								
								Fix Lint/ConstantDefinitionInBlock cop ( #24763 )  
							
							
							
						 
						
							2023-05-03 10:32:30 +02:00  
				
					
						
							
							
								 
						
							
								8b636a29c6 
								
							 
						 
						
							
							
								
								Improve automatic post cleanup worker performances ( #24785 )  
							
							
							
						 
						
							2023-05-03 10:31:40 +02:00  
				
					
						
							
							
								 
						
							
								a0c9f2447e 
								
							 
						 
						
							
							
								
								Fix Performance/MethodObjectAsBlock cop ( #24798 )  
							
							
							
						 
						
							2023-05-03 10:30:54 +02:00  
				
					
						
							
							
								 
						
							
								97385f27bd 
								
							 
						 
						
							
							
								
								Fix Performance/RedundantEqualityComparisonBlock cop ( #24799 )  
							
							
							
						 
						
							2023-05-03 10:30:10 +02:00  
				
					
						
							
							
								 
						
							
								05e3abe9d9 
								
							 
						 
						
							
							
								
								Fix Lint/EmptyClass cop ( #24795 )  
							
							
							
						 
						
							2023-05-02 21:06:51 +02:00  
				
					
						
							
							
								 
						
							
								a7df578f97 
								
							 
						 
						
							
							
								
								ApplicationHelper spec coverage, unused removal, tiny refactor ( #24762 )  
							
							
							
						 
						
							2023-05-02 18:10:39 +02:00  
				
					
						
							
							
								 
						
							
								570079f8ce 
								
							 
						 
						
							
							
								
								Fix Performance/TimesMap cop ( #24789 )  
							
							
							
						 
						
							2023-05-02 18:07:16 +02:00  
				
					
						
							
							
								 
						
							
								9189e90ff2 
								
							 
						 
						
							
							
								
								Add fallback redirection when getting a webfinger query `LOCAL_DOMAIN@LOCAL_DOMAIN` ( #23600 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-05-02 17:42:42 +02:00  
				
					
						
							
							
								 
						
							
								b233da5996 
								
							 
						 
						
							
							
								
								Optimize archive export service and export zip files instead of gzipped tar files ( #23360 )  
							
							
							
						 
						
							2023-05-02 15:09:43 +02:00  
				
					
						
							
							
								 
						
							
								6693a4fe7c 
								
							 
						 
						
							
							
								
								Change lists to be able to include accounts with pending follow requests ( #19727 )  
							
							
							
						 
						
							2023-05-02 14:40:36 +02:00  
				
					
						
							
							
								 
						
							
								1eb51bd749 
								
							 
						 
						
							
							
								
								Add request specs for caching behavior ( #24592 )  
							
							
							
						 
						
							2023-05-02 13:58:29 +02:00  
				
					
						
							
							
								 
						
							
								32a030dd74 
								
							 
						 
						
							
							
								
								Rewrite import feature ( #21054 )  
							
							
							
						 
						
							2023-05-02 12:08:48 +02:00  
				
					
						
							
							
								 
						
							
								d00e45a7d3 
								
							 
						 
						
							
							
								
								Fix Rails/I18nLocaleAssignment cop ( #24693 )  
							
							
							
						 
						
							2023-04-30 14:07:03 +02:00  
				
					
						
							
							
								 
						
							
								c23d285b16 
								
							 
						 
						
							
							
								
								Remove the u in Favorite for non-gb english ( #24667 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-30 16:33:37 +09:00