69ea596e55 
								
							 
						 
						
							
							
								
								[Glitch] Fix explore page reloading when you navigate back to it in web UI  
							
							... 
							
							
							
							Port d9503a1965 
							
						 
						
							2023-10-24 19:22:39 +02:00  
				
					
						
							
							
								 
						
							
								e6c3d3c744 
								
							 
						 
						
							
							
								
								Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-24 19:21:01 +02:00  
				
					
						
							
							
								 
						
							
								79c154f602 
								
							 
						 
						
							
							
								
								Merge commit 'fc7734df8d8d53639bf244a2f2f3c39bc2fd12a7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-24 19:20:14 +02:00  
				
					
						
							
							
								 
						
							
								57c0de949b 
								
							 
						 
						
							
							
								
								Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change. 
							
						 
						
							2023-10-24 19:17:20 +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  
				
					
						
							
							
								 
						
							
								5323f0eeca 
								
							 
						 
						
							
							
								
								[Glitch] Fix incorrect proptypes from react-router-v5 update  
							
							... 
							
							
							
							Port 0ad66175bf 
							
						 
						
							2023-10-24 19:03:16 +02:00  
				
					
						
							
							
								 
						
							
								9325cb5759 
								
							 
						 
						
							
							
								
								[Glitch] Convert `<Button>` to Typescript  
							
							... 
							
							
							
							Port 9d45a444f9 
							
						 
						
							2023-10-24 19:03:16 +02:00  
				
					
						
							
							
								 
						
							
								1138d44c7d 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing background behind dismissable banner in web UI  
							
							... 
							
							
							
							Port 33bd8eccd5 
							
						 
						
							2023-10-24 18:46:08 +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  
				
					
						
							
							
								 
						
							
								15182d1e5e 
								
							 
						 
						
							
							
								
								Fix history handling not properly handling states after update to react-router v5 ( #27526 )  
							
							
							
						 
						
							2023-10-24 13:24:57 +00:00  
				
					
						
							
							
								 
						
							
								6cf9f1211b 
								
							 
						 
						
							
							
								
								Create custom Github Actions for common steps ( #27518 )  
							
							
							
						 
						
							2023-10-24 11:43:24 +00:00  
				
					
						
							
							
								 
						
							
								714e3ae5b5 
								
							 
						 
						
							
							
								
								Use Rails 7.1 `normalizes` feature ( #27521 )  
							
							
							
						 
						
							2023-10-24 10:06:10 +00:00  
				
					
						
							
							
								 
						
							
								50b7ea810e 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27523 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-24 09:51:34 +00:00  
				
					
						
							
							
								 
						
							
								e923bb9ec9 
								
							 
						 
						
							
							
								
								Use `ENV.fetch` in views, fixes rubocop haml-lint issue ( #27527 )  
							
							
							
						 
						
							2023-10-24 09:30:14 +00:00  
				
					
						
							
							
								 
						
							
								4fdc548fa5 
								
							 
						 
						
							
							
								
								Regenerate lint todos ( #27513 )  
							
							
							
						 
						
							2023-10-24 08:08:31 +00:00  
				
					
						
							
							
								 
						
							
								9482810703 
								
							 
						 
						
							
							
								
								Rewrite `emoji_unicode_mapping_light` to TS ( #25444 )  
							
							... 
							
							
							
							Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp> 
							
						 
						
							2023-10-24 08:06:14 +00:00  
				
					
						
							
							
								 
						
							
								e93a75f1a1 
								
							 
						 
						
							
							
								
								Rails 7.1 update ( #25963 )  
							
							
							
						 
						
							2023-10-23 17:58:29 +00:00  
				
					
						
							
							
								 
						
							
								379115e601 
								
							 
						 
						
							
							
								
								Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )  
							
							
							
						 
						
							2023-10-23 15:46:21 +00:00  
				
					
						
							
							
								 
						
							
								26d2a2a0cc 
								
							 
						 
						
							
							
								
								Migrate to request specs in `/api/v1/media` ( #25543 )  
							
							
							
						 
						
							2023-10-23 15:46:21 +00:00  
				
					
						
							
							
								 
						
							
								d9503a1965 
								
							 
						 
						
							
							
								
								Fix explore page reloading when you navigate back to it in web UI ( #27489 )  
							
							
							
						 
						
							2023-10-23 17:07:13 +02:00  
				
					
						
							
							
								 
						
							
								79a63201a9 
								
							 
						 
						
							
							
								
								Fix Layout/EmptyLineAfterGuardClause issues caused by merging an old PR ( #27512 )  
							
							
							
						 
						
							2023-10-23 16:21:48 +02:00  
				
					
						
							
							
								 
						
							
								fc7734df8d 
								
							 
						 
						
							
							
								
								Remove Renovate's Lock File Maintenance task ( #27510 )  
							
							
							
						 
						
							2023-10-23 14:38:36 +02:00  
				
					
						
							
							
								 
						
							
								3cfdab6b48 
								
							 
						 
						
							
							
								
								Prune the changelog of older entries ( #27432 )  
							
							
							
						 
						
							2023-10-23 14:35:56 +02:00  
				
					
						
							
							
								 
						
							
								d5408dbb54 
								
							 
						 
						
							
							
								
								Update dependency prom-client to v15 ( #27330 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 14:33:17 +02:00  
				
					
						
							
							
								 
						
							
								8b770ce811 
								
							 
						 
						
							
							
								
								Add warnings to report action logs ( #27425 )  
							
							
							
						 
						
							2023-10-23 14:30:46 +02:00  
				
					
						
							
							
								 
						
							
								44edf3aa91 
								
							 
						 
						
							
							
								
								Improve error handling in mastodon:setup task ( #21464 )  
							
							
							
						 
						
							2023-10-23 14:28:32 +02:00  
				
					
						
							
							
								 
						
							
								99f2534cee 
								
							 
						 
						
							
							
								
								Add support for displaying unknown servers on /admin/instances/:domain ( #27150 )  
							
							
							
						 
						
							2023-10-23 14:27:57 +02:00  
				
					
						
							
							
								 
						
							
								c3e0eb3699 
								
							 
						 
						
							
							
								
								Change Content-Security-Policy to be tighter on media paths ( #26889 )  
							
							
							
						 
						
							2023-10-23 14:27:07 +02:00  
				
					
						
							
							
								 
						
							
								bcae744275 
								
							 
						 
						
							
							
								
								Fix some link anchors being recognized as hashtags ( #27271 )  
							
							
							
						 
						
							2023-10-23 14:19:38 +02:00  
				
					
						
							
							
								 
						
							
								53fd28b889 
								
							 
						 
						
							
							
								
								Update dependency react-select to v5.7.7 ( #27003 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:45:14 +02:00  
				
					
						
							
							
								 
						
							
								f7b34707a8 
								
							 
						 
						
							
							
								
								Update babel monorepo to v7.23.2 ( #27118 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:36:47 +02:00  
				
					
						
							
							
								 
						
							
								25751c653e 
								
							 
						 
						
							
							
								
								Update DefinitelyTyped types (non-major) ( #27414 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:35:54 +02:00  
				
					
						
							
							
								 
						
							
								132204031f 
								
							 
						 
						
							
							
								
								Update dependency core-js to v3.33.1 ( #27481 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:20:01 +02:00  
				
					
						
							
							
								 
						
							
								bb5bae186f 
								
							 
						 
						
							
							
								
								Update dependency webpack-merge to v5.10.0 ( #27420 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:18:16 +02:00  
				
					
						
							
							
								 
						
							
								69d3318055 
								
							 
						 
						
							
							
								
								Update dependency rimraf to v5.0.5 ( #27140 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:16:02 +02:00  
				
					
						
							
							
								 
						
							
								cd08b436ab 
								
							 
						 
						
							
							
								
								Update dependency sass to v1.69.4 ( #27004 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:15:31 +02:00  
				
					
						
							
							
								 
						
							
								6f1eb89d21 
								
							 
						 
						
							
							
								
								Update dependency ws to v8.14.2 ( #26980 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:14:16 +02:00  
				
					
						
							
							
								 
						
							
								6f429d3f1b 
								
							 
						 
						
							
							
								
								Update formatjs monorepo ( #27416 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:13:12 +02:00  
				
					
						
							
							
								 
						
							
								773133befa 
								
							 
						 
						
							
							
								
								Update eslint (non-major) ( #27415 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-10-23 12:12:17 +02:00  
				
					
						
							
							
								 
						
							
								0ad66175bf 
								
							 
						 
						
							
							
								
								Fix incorrect proptypes from react-router-v5 update ( #27507 )  
							
							
							
						 
						
							2023-10-23 11:39:53 +02:00  
				
					
						
							
							
								 
						
							
								70fd819935 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27490 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-23 10:04:54 +02:00  
				
					
						
							
							
								 
						
							
								b0213472df 
								
							 
						 
						
							
							
								
								Validate allowed schemes on preview card URLs ( #27485 )  
							
							
							
						 
						
							2023-10-23 09:50:02 +02:00  
				
					
						
							
							
								 
						
							
								9d45a444f9 
								
							 
						 
						
							
							
								
								Convert `<Button>` to Typescript ( #27492 )  
							
							
							
						 
						
							2023-10-23 09:43:00 +02:00  
				
					
						
							
							
								 
						
							
								d6eacb79c6 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to react-router v5  
							
							... 
							
							
							
							Port 1b70d7ed7c 
							
						 
						
							2023-10-21 22:14:24 +02:00  
				
					
						
							
							
								 
						
							
								245513d630 
								
							 
						 
						
							
							
								
								Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-10-21 14:33:33 +02:00  
				
					
						
							
							
								 
						
							
								18eacc7a07 
								
							 
						 
						
							
							
								
								Merge pull request  #2447  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to 126cd7705d 
							
						 
						
							2023-10-21 14:32:30 +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  
				
					
						
							
							
								 
						
							
								284c719f64 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #27480 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-10-20 10:11:40 +02:00  
				
					
						
							
							
								 
						
							
								33bd8eccd5 
								
							 
						 
						
							
							
								
								Fix missing background behind dismissable banner in web UI ( #27479 )  
							
							
							
						 
						
							2023-10-20 04:08:13 +02:00