Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								57e9fc7e5a 
								
							 
						 
						
							
							
								
								[Glitch] Remove isNaN polyfill  
							
							... 
							
							
							
							Port 169b9c9b13 
							
						 
						
							2023-03-26 15:49:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6a5a699fbb 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/main  
							
							
							
						 
						
							2023-03-26 15:47:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								8b68ca7e61 
								
							 
						 
						
							
							
								
								Add missing parenthesis ( #24238 )  
							
							
							
						 
						
							2023-03-24 04:35:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								e272fc91e4 
								
							 
						 
						
							
							
								
								Remove legacy decorators syntax ( #18357 )  
							
							
							
						 
						
							2023-03-24 03:17:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								2ed77774f7 
								
							 
						 
						
							
							
								
								Exclude files for Rubocop Metrics/ClassLength ( #24213 )  
							
							
							
						 
						
							2023-03-23 23:19:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								313feca996 
								
							 
						 
						
							
							
								
								Use Yarn production install for asset compile ( #24232 )  
							
							
							
						 
						
							2023-03-23 22:49:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
							
							
								
							
							
								148744b14b 
								
							 
						 
						
							
							
								
								Fix docker images not being pushed ( #2143 )  
							
							... 
							
							
							
							* Change repo from mastodon/mastodon to glitch-soc/mastodon
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove repo check from build-image workflow
Reverts a3037c8e71 
							
						 
						
							2023-03-23 10:15:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								fa8a87da5c 
								
							 
						 
						
							
							
								
								Merge pull request  #2144  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-03-23 10:15:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								169b9c9b13 
								
							 
						 
						
							
							
								
								Remove isNaN polyfill ( #24224 )  
							
							
							
						 
						
							2023-03-23 09:47:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								61e7fe2e2a 
								
							 
						 
						
							
							
								
								Fix broken links in account gallery ( #24218 )  
							
							
							
						 
						
							2023-03-23 05:17:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogamin 
								
							 
						 
						
							
							
							
							
								
							
							
								aa45960804 
								
							 
						 
						
							
							
								
								[Glitch] Fit the max-width of media in .prose to parent box  
							
							... 
							
							
							
							Port 6ffb8609f9 
							
						 
						
							2023-03-22 20:00:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d11d2dda17 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/status.rb`:
  Upstream added lines close to a glitch-soc only line, not a real conflict.
  Applied upstream's changes (added hooks) while keeping glitch-soc's changes
  (`local_only` scope).
- `config/environments/production.rb`:
  Upstream removed a header, while we have glitch-soc specific ones.
  Removed the header removed upstream. 
							
						 
						
							2023-03-22 19:50:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								12eb6740d1 
								
							 
						 
						
							
							
								
								Fix Rails cache namespace being overriden with v2 for cached statuses ( #24202 )  
							
							
							
						 
						
							2023-03-22 15:47:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								4e4b2bc78e 
								
							 
						 
						
							
							
								
								Remove unused InstancePresenter methods ( #24206 )  
							
							
							
						 
						
							2023-03-22 14:15:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								d38c3ba12e 
								
							 
						 
						
							
							
								
								Add specs for Chewy importers ( #24204 )  
							
							
							
						 
						
							2023-03-22 14:06:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Simon Elvery 
								
							 
						 
						
							
							
							
							
								
							
							
								a3674b0e32 
								
							 
						 
						
							
							
								
								Update profile link verification instructions ( #19723 )  
							
							... 
							
							
							
							Co-authored-by: Effy Elden <effy@effy.space> 
							
						 
						
							2023-03-22 11:22:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f8486dc29a 
								
							 
						 
						
							
							
								
								Bump version to v4.1.1 ( #24201 )  
							
							
							
						 
						
							2023-03-21 15:04:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								df68ba2e6a 
								
							 
						 
						
							
							
								
								Refactoring relations_map ( #24195 )  
							
							
							
						 
						
							2023-03-21 10:32:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								a3268654d5 
								
							 
						 
						
							
							
								
								Bump stackprof from 0.2.23 to 0.2.24 ( #24190 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-03-21 10:25:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								bd5bc8798c 
								
							 
						 
						
							
							
								
								Bump prettier from 2.8.4 to 2.8.5 ( #24188 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-03-21 10:51:31 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								582793fc24 
								
							 
						 
						
							
							
								
								Bump stylelint from 15.2.0 to 15.3.0 ( #24185 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-03-21 10:49:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								96adc74e7a 
								
							 
						 
						
							
							
								
								Bump react-select from 5.7.0 to 5.7.1 ( #24187 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-03-21 10:47:25 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								a600670940 
								
							 
						 
						
							
							
								
								Bump rack-cors from 1.1.1 to 2.0.1 ( #24189 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-03-21 10:42:34 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								a1775c6287 
								
							 
						 
						
							
							
								
								Bump pghero from 3.3.0 to 3.3.1 ( #24186 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-03-21 00:56:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogamin 
								
							 
						 
						
							
							
							
							
								
							
							
								6ffb8609f9 
								
							 
						 
						
							
							
								
								Fit the max-width of media in .prose to parent box ( #24180 )  
							
							
							
						 
						
							2023-03-20 20:04:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								7a82026971 
								
							 
						 
						
							
							
								
								Remove references to non-existent actions ( #24183 )  
							
							
							
						 
						
							2023-03-20 20:03:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c22722c5a2 
								
							 
						 
						
							
							
								
								Fix crash in tootctl commands making use of parallelization when Elasticsearch is enabled ( #24182 )  
							
							
							
						 
						
							2023-03-20 20:02:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								336cf95418 
								
							 
						 
						
							
							
								
								Remove Permissions-Policy header from all responses ( #24124 )  
							
							
							
						 
						
							2023-03-20 20:02:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
							
							
								
							
							
								5569c86171 
								
							 
						 
						
							
							
								
								Add getting-started-misc to route ( #2141 )  
							
							... 
							
							
							
							* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-03-19 17:26:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vyr Cossont 
								
							 
						 
						
							
							
							
							
								
							
							
								d1b3f02926 
								
							 
						 
						
							
							
								
								Webhooks for local status.create, status.update, account.update ( #24133 )  
							
							
							
						 
						
							2023-03-19 07:47:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3315cce941 
								
							 
						 
						
							
							
								
								Merge pull request  #2138  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-03-18 19:34:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bcac7a5e06 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-03-18 11:21:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6e8896ecc8 
								
							 
						 
						
							
							
								
								Merge pull request  #2136  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-03-18 11:17:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								aca8fc2e1a 
								
							 
						 
						
							
							
								
								Upgrade redis-node to latest ( #24154 )  
							
							
							
						 
						
							2023-03-18 17:05:17 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								85242633aa 
								
							 
						 
						
							
							
								
								Revert "Dedupe yarn.lock with yarn-deduplicate" ( #24155 )  
							
							
							
						 
						
							2023-03-18 17:05:01 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								a75af222bb 
								
							 
						 
						
							
							
								
								Dedupe yarn.lock with yarn-deduplicate ( #24119 )  
							
							
							
						 
						
							2023-03-18 16:09:39 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jean byroot Boussier 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc075c9d4 
								
							 
						 
						
							
							
								
								Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )  
							
							... 
							
							
							
							Co-authored-by: Jean Boussier <jean.boussier@gmail.com> 
							
						 
						
							2023-03-17 14:37:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								8d05167e5f 
								
							 
						 
						
							
							
								
								Include config/ and update all rubcop deps ( #23963 )  
							
							
							
						 
						
							2023-03-17 10:13:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CSDUMMI 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c5ccafca 
								
							 
						 
						
							
							
								
								Link to the Identity provider's account settings from the account settings ( #24100 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-03-17 10:09:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								56555a12b5 
								
							 
						 
						
							
							
								
								Bump rimraf from 4.1.2 to 4.4.0 ( #24048 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-03-17 10:08:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								dc5e2fe4f1 
								
							 
						 
						
							
							
								
								Bump glob from 8.1.0 to 9.3.0 ( #24110 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-03-17 09:43:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								bb60db4471 
								
							 
						 
						
							
							
								
								[Glitch] Replace Status#translatable? with language matrix in separate endpoint  
							
							... 
							
							
							
							Port 7583523bf0 
							
						 
						
							2023-03-16 23:21:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								488cd37f1a 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did. 
							
						 
						
							2023-03-16 23:12:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								769e8b2ad9 
								
							 
						 
						
							
							
								
								Merge pull request  #2134  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-03-16 23:09:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								c2821e2aa3 
								
							 
						 
						
							
							
								
								Ignore additional Style/OptionalBooleanParameter ( #24138 )  
							
							
							
						 
						
							2023-03-16 23:07:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3b17f2f718 
								
							 
						 
						
							
							
								
								Add warning for object storage misconfiguration ( #24137 )  
							
							
							
						 
						
							2023-03-16 22:47:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ef0c6a43ed 
								
							 
						 
						
							
							
								
								Change user backups to use expiring URLs for download when possible ( #24136 )  
							
							
							
						 
						
							2023-03-16 22:46:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								10a4c16256 
								
							 
						 
						
							
							
								
								Roll back unintentionally activated rubocop rules ( #24132 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com> 
							
						 
						
							2023-03-16 22:24:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								83f302c101 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23904 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-03-16 21:02:00 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								7583523bf0 
								
							 
						 
						
							
							
								
								Replace Status#translatable? with language matrix in separate endpoint ( #24037 )  
							
							
							
						 
						
							2023-03-16 11:07:24 +01:00