fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						ab7716cff4 
					 
					
						
						
							
							Rename Image component to ServerHeroImage ( #24894 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 23:08:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						0fff2b67de 
					 
					
						
						
							
							Disable broken onboarding code  
						
						 
						
						
						
						
					 
					
						2023-05-09 23:03:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						5f2071d055 
					 
					
						
						
							
							[Glitch] Enforce stricter rules for Typescript files  
						
						 
						
						... 
						
						
						
						Port c8181eb0a4  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 22:56:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						b509b96504 
					 
					
						
						
							
							[Glitch] Enforce React Rules of Hooks with eslint  
						
						 
						
						... 
						
						
						
						Port d9b93bd15e  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 22:28:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						108720d7b0 
					 
					
						
						
							
							[Glitch] Dont use CommonJS (require, module.exports) anywhere  
						
						 
						
						... 
						
						
						
						Port 955179fc55  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 22:28:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						c81d1b0d38 
					 
					
						
						
							
							Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did. 
						
						
					 
					
						2023-05-09 22:12:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								たいち ひ 
							
						 
					 
					
						
						
							
						
						887112a065 
					 
					
						
						
							
							[Glitch] Add TypeScript support for mastodon alias and image imports  
						
						 
						
						... 
						
						
						
						Port 7c1305b3a4  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 21:50:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						42bdc2add9 
					 
					
						
						
							
							Copy hooks/useHovering.ts to glitch-soc  
						
						 
						
						
						
						
					 
					
						2023-05-09 21:30:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						8e806b6e88 
					 
					
						
						
							
							Fix IconButton prop types in glitch-soc  
						
						 
						
						
						
						
					 
					
						2023-05-09 21:11:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						6415981056 
					 
					
						
						
							
							[Glitch] Mark wheel events on scrollable list as passive  
						
						 
						
						... 
						
						
						
						Port 89269e4b71  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 20:42:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						f94eb65cf9 
					 
					
						
						
							
							[Glitch] Rewrite Domain component as function component  
						
						 
						
						... 
						
						
						
						Port 9818f34273  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 20:33:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						468dfffd26 
					 
					
						
						
							
							[Glitch] Use LayoutType from is_mobile in actions/app  
						
						 
						
						... 
						
						
						
						Port 5bc8e2d1fd  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 20:32:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								たいち ひ 
							
						 
					 
					
						
						
							
						
						87a704f70b 
					 
					
						
						
							
							[Glitch] Rewrite RadioButton component as FC  
						
						 
						
						... 
						
						
						
						Port 76264e3fe8  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 20:25:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								たいち ひ 
							
						 
					 
					
						
						
							
						
						bd851d3b58 
					 
					
						
						
							
							[Glitch] Rewrite Image component as function component  
						
						 
						
						... 
						
						
						
						Port a65d2d1045  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 20:24:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								たいち ひ 
							
						 
					 
					
						
						
							
						
						1edaf58fb9 
					 
					
						
						
							
							[Glitch] Rewrite <NotSignedInIndicator /> as FC  
						
						 
						
						... 
						
						
						
						Port 490ccbf40b  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-09 20:24:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						8b568755ad 
					 
					
						
						
							
							Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `tsconfig.json`:
  Upstream changed the config to properly process imports.
  Glitch-soc had previously already done so.
  Changed the config to better match upstream. 
						
						
					 
					
						2023-05-09 20:12:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						51b83ed195 
					 
					
						
						
							
							Use Prettier for ESLint formatting TypeScript ( #23631 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 19:02:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						6aeb162927 
					 
					
						
						
							
							Type Redux store and middleware ( #24843 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 16:56:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						e1f466fbbe 
					 
					
						
						
							
							Fix javascript on moderation interface ( #24933 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 16:42:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						224d458f7e 
					 
					
						
						
							
							Remove unused iOS agent sniffing function ( #24931 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 15:48:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						a3a2414f0e 
					 
					
						
						
							
							Rework polyfills loading ( #24907 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 14:55:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						6579e3af7d 
					 
					
						
						
							
							Add more detailed type annotation for Account ( #24815 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 12:09:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						c8181eb0a4 
					 
					
						
						
							
							Enforce stricter rules for Typescript files ( #24910 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 03:11:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						d9b93bd15e 
					 
					
						
						
							
							Enforce React Rules of Hooks with eslint ( #24911 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 03:09:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						955179fc55 
					 
					
						
						
							
							Dont use CommonJS (require, module.exports) anywhere ( #24913 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 03:08:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						89269e4b71 
					 
					
						
						
							
							Mark wheel events on scrollable list as passive ( #24914 )  
						
						 
						
						
						
						
					 
					
						2023-05-09 03:07:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						ea04f33f50 
					 
					
						
						
							
							[Glitch] Fixes build errors from some previous TS-related commits  
						
						 
						
						... 
						
						
						
						Port 45579a26cf  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						3d9e35375c 
					 
					
						
						
							
							[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction  
						
						 
						
						... 
						
						
						
						Port 0999cb4601  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renaud Chaput 
							
						 
					 
					
						
						
							
						
						a33d6c946a 
					 
					
						
						
							
							[Glitch] Remove MastodonMap TS type  
						
						 
						
						... 
						
						
						
						Port 9a52a7f7a0  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						e8243d5bbd 
					 
					
						
						
							
							[Glitch] Add type annotation for some js files  
						
						 
						
						... 
						
						
						
						Port e38b391940  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						5f0d2b6e3b 
					 
					
						
						
							
							Copy Typescript type definitions to glitch-soc  
						
						 
						
						
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						f3af434c25 
					 
					
						
						
							
							[Glitch] Fix incorrect import of redux store  
						
						 
						
						... 
						
						
						
						Port 9c1929efad  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						f4e3e309b1 
					 
					
						
						
							
							[Glitch] use configureStore of redux-toolkit instead of createStore of redux  
						
						 
						
						... 
						
						
						
						Port 8227af8dcc  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						bbd0e9caa6 
					 
					
						
						
							
							[Glitch] Add ALT badges to media that has alternative text in web UI  
						
						 
						
						... 
						
						
						
						Port 8131a5b330  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						a8939e9098 
					 
					
						
						
							
							[Glitch] Change media elements to use aspect-ratio rather than compute height themselves  
						
						 
						
						... 
						
						
						
						Port 598e63dad2  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 22:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						10f5329ddf 
					 
					
						
						
							
							[Glitch] Fix incorrect box shadow on avatar in thread view  
						
						 
						
						... 
						
						
						
						Port d37c0a1060  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 21:09:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						9ab89bb832 
					 
					
						
						
							
							[Glitch] Add type annotation for Blurhash component  
						
						 
						
						... 
						
						
						
						Port f50105779b  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 21:09:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						20f1f3aa7d 
					 
					
						
						
							
							[Glitch] Add type annotation for IconButton component  
						
						 
						
						... 
						
						
						
						Port 5a5975d7f7  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 21:09:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						f89f3a8566 
					 
					
						
						
							
							Fix glitch-soc's thread line styling ( #2214 )  
						
						 
						
						... 
						
						
						
						Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes. 
						
						
					 
					
						2023-05-08 18:21:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						aff2d55b80 
					 
					
						
						
							
							[Glitch] Add type annotation for RelativeTimestamp component  
						
						 
						
						... 
						
						
						
						Port 15fd712464  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 16:02:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						a49707dacb 
					 
					
						
						
							
							[Glitch] Rewrite Icon and IconWithBadge with typescript  
						
						 
						
						... 
						
						
						
						Port 81f75b1e0e  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 15:59:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						7835f8fd22 
					 
					
						
						
							
							[Glitch] Fix icons having an image role  
						
						 
						
						... 
						
						
						
						Port 24b2c60beb  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 15:57:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						e9eab013e7 
					 
					
						
						
							
							[Glitch] Fix audio player width in thread view  
						
						 
						
						... 
						
						
						
						Port cf1bc4bb93  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 15:50:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						51479f5c28 
					 
					
						
						
							
							[Glitch] Add eslint-plugin-jsdoc  
						
						 
						
						... 
						
						
						
						Port f22b4e556c  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 15:48:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Schmidt 
							
						 
					 
					
						
						
							
						
						09054f5485 
					 
					
						
						
							
							[Glitch] Fix media description not being cleared  
						
						 
						
						... 
						
						
						
						Port bfeccf6748  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com > 
						
						
					 
					
						2023-05-08 15:41:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						5d18840ab9 
					 
					
						
						
							
							Fix more JS linting issues ( #2212 )  
						
						 
						
						... 
						
						
						
						* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button 
						
						
					 
					
						2023-05-08 15:16:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						9818f34273 
					 
					
						
						
							
							Rewrite Domain component as function component ( #24896 )  
						
						 
						
						
						
						
					 
					
						2023-05-08 15:12:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fusagiko / takayamaki 
							
						 
					 
					
						
						
							
						
						5bc8e2d1fd 
					 
					
						
						
							
							Use LayoutType from is_mobile in actions/app ( #24863 )  
						
						 
						
						
						
						
					 
					
						2023-05-08 15:10:21 +02:00