Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a766804e02 
								
							 
						 
						
							
							
								
								Use Yarn instead of NPX for pre-commit hook ( #24287 )  
							
							
							
						 
						
							2023-03-28 06:28:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2115413fa1 
								
							 
						 
						
							
							
								
								Remove remaining CodeClimate references ( #24289 )  
							
							
							
						 
						
							2023-03-28 02:07:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0d70deee53 
								
							 
						 
						
							
							
								
								Add migration tests for user mail notification settings ( #24277 )  
							
							
							
						 
						
							2023-03-27 17:54:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e084b5b82d 
								
							 
						 
						
							
							
								
								Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support ( #24200 )  
							
							
							
						 
						
							2023-03-27 17:07:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ddb769f0b8 
								
							 
						 
						
							
							
								
								Move marky to devDependency ( #24258 )  
							
							
							
						 
						
							2023-03-27 16:11:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c0e87ad8ed 
								
							 
						 
						
							
							
								
								Update strong-migrations-enabled migrations from 5.0 and 5.1 to 5.2 ( #24275 )  
							
							
							
						 
						
							2023-03-27 16:09:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf12621e37 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24130 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-03-27 20:01:47 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cbdb25ab03 
								
							 
						 
						
							
							
								
								Merge pull request  #2151  from ClearlyClaire/glitch-soc/main  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-03-27 12:49:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								babd86e594 
								
							 
						 
						
							
							
								
								Refactor styles to use logical properties for positioning ( #23944 )  
							
							
							
						 
						
							2023-03-27 10:56:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vyr Cossont 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								88fc04d3d7 
								
							 
						 
						
							
							
								
								Serialize status webhook events in REST API format ( #24243 )  
							
							
							
						 
						
							2023-03-27 09:14:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b7898230e 
								
							 
						 
						
							
							
								
								Update strong_migrations to version 0.8.0 ( #24270 )  
							
							
							
						 
						
							2023-03-27 09:11:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									neatchee 
								
							 
						 
						
							
							
							
							
								
							
							
								8215df76c0 
								
							 
						 
						
							
							
								
								[Glitch] Remove legacy decorators syntax  
							
							... 
							
							
							
							Port d1b057a0ac 
							
						 
						
							2023-03-27 08:51:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								34225d7199 
								
							 
						 
						
							
							
								
								Setup Husky and lint-stage for commit fixing ( #23308 )  
							
							
							
						 
						
							2023-03-27 05:17:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								00c839b9a9 
								
							 
						 
						
							
							
								
								[Glitch] Remove isNaN polyfill  
							
							... 
							
							
							
							Port b46125224c 
							
						 
						
							2023-03-26 15:49:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								14b0311029 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/main  
							
							
							
						 
						
							2023-03-26 15:47:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogamin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								63a6808ee1 
								
							 
						 
						
							
							
								
								Fix typo in _login_activity.html.haml ( #24263 )  
							
							
							
						 
						
							2023-03-26 10:59:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3557a65bb2 
								
							 
						 
						
							
							
								
								Reset model in migration after removing column ( #24250 )  
							
							
							
						 
						
							2023-03-26 00:40:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0663803348 
								
							 
						 
						
							
							
								
								Move link header setting to after_action ( #24251 )  
							
							
							
						 
						
							2023-03-26 00:40:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9e34ef098 
								
							 
						 
						
							
							
								
								Migration warning helper, and only run in production env ( #24253 )  
							
							
							
						 
						
							2023-03-26 00:39:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e633b26f4f 
								
							 
						 
						
							
							
								
								Add allow_other_host in redirects which may go outside app ( #24252 )  
							
							
							
						 
						
							2023-03-26 00:38:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e63524f457 
								
							 
						 
						
							
							
								
								Update retention model sql query ( #24249 )  
							
							
							
						 
						
							2023-03-26 00:37:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bda933740 
								
							 
						 
						
							
							
								
								Change media upload limits and remove client-side resizing ( #23726 )  
							
							
							
						 
						
							2023-03-25 10:00:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef127c964a 
								
							 
						 
						
							
							
								
								Change design of account rows in web UI ( #24247 )  
							
							
							
						 
						
							2023-03-25 08:46:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e8711ff91 
								
							 
						 
						
							
							
								
								Add missing parenthesis ( #24238 )  
							
							
							
						 
						
							2023-03-24 04:35:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1b057a0ac 
								
							 
						 
						
							
							
								
								Remove legacy decorators syntax ( #18357 )  
							
							
							
						 
						
							2023-03-24 03:17:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								503022d6f9 
								
							 
						 
						
							
							
								
								Exclude files for Rubocop Metrics/ClassLength ( #24213 )  
							
							
							
						 
						
							2023-03-23 23:19:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e7e189fa44 
								
							 
						 
						
							
							
								
								Use Yarn production install for asset compile ( #24232 )  
							
							
							
						 
						
							2023-03-23 22:49:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								81e85782d1 
								
							 
						 
						
							
							
								
								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 0b8b0ef652 
							
						 
						
							2023-03-23 10:15:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								867790e07a 
								
							 
						 
						
							
							
								
								Merge pull request  #2144  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-03-23 10:15:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b46125224c 
								
							 
						 
						
							
							
								
								Remove isNaN polyfill ( #24224 )  
							
							
							
						 
						
							2023-03-23 09:47:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16da4a09e8 
								
							 
						 
						
							
							
								
								Fix broken links in account gallery ( #24218 )  
							
							
							
						 
						
							2023-03-23 05:17:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogamin 
								
							 
						 
						
							
							
							
							
								
							
							
								b4f60bc6de 
								
							 
						 
						
							
							
								
								[Glitch] Fit the max-width of media in .prose to parent box  
							
							... 
							
							
							
							Port 0a9def5498 
							
						 
						
							2023-03-22 20:00:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5ac380c122 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2626097869 
								
							 
						 
						
							
							
								
								Fix Rails cache namespace being overriden with v2 for cached statuses ( #24202 )  
							
							
							
						 
						
							2023-03-22 15:47:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7a578a055 
								
							 
						 
						
							
							
								
								Remove unused InstancePresenter methods ( #24206 )  
							
							
							
						 
						
							2023-03-22 14:15:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b179ff84c7 
								
							 
						 
						
							
							
								
								Add specs for Chewy importers ( #24204 )  
							
							
							
						 
						
							2023-03-22 14:06:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Simon Elvery 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								148c3d5894 
								
							 
						 
						
							
							
								
								Update profile link verification instructions ( #19723 )  
							
							... 
							
							
							
							Co-authored-by: Effy Elden <effy@effy.space> 
							
						 
						
							2023-03-22 11:22:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f8e1bede4 
								
							 
						 
						
							
							
								
								Bump version to v4.1.1 ( #24201 )  
							
							
							
						 
						
							2023-03-21 15:04:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								38c84f57b6 
								
							 
						 
						
							
							
								
								Refactoring relations_map ( #24195 )  
							
							
							
						 
						
							2023-03-21 10:32:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f8d1601a4 
								
							 
						 
						
							
							
								
								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] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a4d285f2f9 
								
							 
						 
						
							
							
								
								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] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								de6d504023 
								
							 
						 
						
							
							
								
								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] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f20843e60d 
								
							 
						 
						
							
							
								
								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] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								84f14b2451 
								
							 
						 
						
							
							
								
								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] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f4cbce295 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0a9def5498 
								
							 
						 
						
							
							
								
								Fit the max-width of media in .prose to parent box ( #24180 )  
							
							
							
						 
						
							2023-03-20 20:04:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bef11630d 
								
							 
						 
						
							
							
								
								Remove references to non-existent actions ( #24183 )  
							
							
							
						 
						
							2023-03-20 20:03:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bdeb6ff180 
								
							 
						 
						
							
							
								
								Fix crash in tootctl commands making use of parallelization when Elasticsearch is enabled ( #24182 )  
							
							
							
						 
						
							2023-03-20 20:02:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ca54a4105 
								
							 
						 
						
							
							
								
								Remove Permissions-Policy header from all responses ( #24124 )  
							
							
							
						 
						
							2023-03-20 20:02:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02ac94490a 
								
							 
						 
						
							
							
								
								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