renovate[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								b27cad27c2 
								
							 
						 
						
							
							
								
								Update dependency bootsnap to '~> 1.18.0' ( #29019 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-02-06 20:59:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									renovate[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								63f1f1465a 
								
							 
						 
						
							
							
								
								Update dependency tzinfo-data to v1.2024.1 ( #29052 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-02-06 20:59:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								4cd00c0dd9 
								
							 
						 
						
							
							
								
								Update nsa gem to version 0.3.0 ( #29065 )  
							
							
							
						 
						
							2024-02-06 20:59:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									renovate[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								c6f7e3a1fb 
								
							 
						 
						
							
							
								
								Update dependency haml_lint to v0.56.0 ( #29082 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-02-06 20:59:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									renovate[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								93aa783aa1 
								
							 
						 
						
							
							
								
								Update dependency nokogiri to v1.16.2 [SECURITY] ( #29106 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-02-06 20:59:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									renovate[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								868333c86f 
								
							 
						 
						
							
							
								
								Update dependency capybara to v3.40.0 ( #28966 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-02-06 20:59:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									renovate[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								ac49514bd6 
								
							 
						 
						
							
							
								
								Update dependency chewy to v7.5.1 ( #29018 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-02-06 20:59:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a2611d782c 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #2588 )  
							
							... 
							
							
							
							* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-02-06 20:45:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JS Moore 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								541cbdd963 
								
							 
						 
						
							
							
								
								Add env variable support for number of followable hashtags in feed column ( #2500 )  
							
							... 
							
							
							
							* Add env variable support for number of followable hashtags in feed column.
* Add a note about performance concerns for higher values.
See discussion in https://github.com/glitch-soc/mastodon/pull/2500 
* Update .devcontainer/docker-compose.yml
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-02-06 20:23:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Essem 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								08e511cecb 
								
							 
						 
						
							
							
								
								Fix doodle modal icons ( #2597 )  
							
							
							
						 
						
							2024-02-06 20:22:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5bc39b3196 
								
							 
						 
						
							
							
								
								Fix build-security docker tags  
							
							
							
						 
						
							2024-02-01 20:30:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c3936cbbe3 
								
							 
						 
						
							
							
								
								Temporary hack to correctly tag the security docker image…  
							
							
							
						 
						
							2024-02-01 18:40:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Brady 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								970320d73c 
								
							 
						 
						
							
							
								
								Restore -streaming suffix for security builds ( #2602 )  
							
							
							
						 
						
							2024-02-01 17:20:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								63d7a30503 
								
							 
						 
						
							
							
								
								Fix build-security workflow for glitch-soc  
							
							
							
						 
						
							2024-02-01 16:09:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								ff58ec0103 
								
							 
						 
						
							
							
								
								Merge pull request from GHSA-3fjr-858r-92rw  
							
							... 
							
							
							
							* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1 
							
						 
						
							2024-02-01 15:57:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3866597e24 
								
							 
						 
						
							
							
								
								Merge pull request  #2601  from ClearlyClaire/glitch-soc/fixes/security-builds-latest  
							
							... 
							
							
							
							Fix security builds not being tagged latest 
							
						 
						
							2024-02-01 11:48:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a7b16003e1 
								
							 
						 
						
							
							
								
								Fix security builds not being marked latest  
							
							
							
						 
						
							2024-02-01 11:31:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								626ff320cf 
								
							 
						 
						
							
							
								
								Merge pull request  #2600  from ClearlyClaire/glitch-soc/fixes/failures  
							
							... 
							
							
							
							Configure selenium to use Chrome version 120 (#29038 ) 
							
						 
						
							2024-02-01 11:30:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								f4416e6b3a 
								
							 
						 
						
							
							
								
								Configure selenium to use Chrome version 120 ( #29038 )  
							
							
							
						 
						
							2024-02-01 11:15:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bb5f6efbc 
								
							 
						 
						
							
							
								
								Merge pull request  #2599  from ClearlyClaire/glitch-soc/build-action  
							
							... 
							
							
							
							Add github action workflow for manual security builds 
							
						 
						
							2024-02-01 11:14:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								883f589653 
								
							 
						 
						
							
							
								
								Fix missing workflow_dispatch trigger for build-security ( #29041 )  
							
							
							
						 
						
							2024-02-01 10:58:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								85bdd145dc 
								
							 
						 
						
							
							
								
								Adapt workflow to glitch-soc  
							
							
							
						 
						
							2024-02-01 10:40:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a48447a6b2 
								
							 
						 
						
							
							
								
								Add github action workflow for manual security builds ( #29040 )  
							
							
							
						 
						
							2024-02-01 10:39:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b87673f5e 
								
							 
						 
						
							
							
								
								Remove obsolete locale file ( #2596 )  
							
							
							
						 
						
							2024-01-30 23:21:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ede233146 
								
							 
						 
						
							
							
								
								Fix crash in private mention conversations in glitch-soc flavor ( #2595 )  
							
							
							
						 
						
							2024-01-30 22:42:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80308d384a 
								
							 
						 
						
							
							
								
								[Glitch] Refactor conversations components in web UI ( #2589 )  
							
							... 
							
							
							
							Port 3205a654ca 
							
						 
						
							2024-01-28 14:53:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a4e7cc2d94 
								
							 
						 
						
							
							
								
								Merge pull request  #2590  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to bf153b384b 
							
						 
						
							2024-01-28 14:47:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bf153b384b 
								
							 
						 
						
							
							
								
								Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict. 
							
						 
						
							2024-01-27 19:06:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								420ca90071 
								
							 
						 
						
							
							
								
								Merge pull request  #2585  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to 3205a654ca 
							
						 
						
							2024-01-27 18:35:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								dd7a66949a 
								
							 
						 
						
							
							
								
								Fix CSS loading in redirect controller  
							
							
							
						 
						
							2024-01-26 21:04:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								54ece5040d 
								
							 
						 
						
							
							
								
								[Glitch] Use active variants for boost icons and increase icon size  
							
							... 
							
							
							
							Port 5a838ceaa9 
							
						 
						
							2024-01-26 20:53:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e5f50478b5 
								
							 
						 
						
							
							
								
								[Glitch] Add confirmation when redirecting logged-out requests to permalink  
							
							... 
							
							
							
							Port SCSS changes from b19ae521b7 
							
						 
						
							2024-01-26 20:51:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5fa2821853 
								
							 
						 
						
							
							
								
								Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-26 20:47:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ae9c675930 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #2564 )  
							
							... 
							
							
							
							* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-26 19:45:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								108fb33478 
								
							 
						 
						
							
							
								
								Merge pull request  #2584  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to 7a1f087659 
							
						 
						
							2024-01-26 18:47:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								70de52c297 
								
							 
						 
						
							
							
								
								Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-01-25 19:51:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								adde803656 
								
							 
						 
						
							
							
								
								Merge pull request  #2583  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes up to 01ce9df880 
							
						 
						
							2024-01-25 19:50:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								42ab855b23 
								
							 
						 
						
							
							
								
								Add specs for Instance model scopes and add with_domain_follows scope ( #28767 )  
							
							
							
						 
						
							2024-01-25 15:28:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4cdf62e576 
								
							 
						 
						
							
							
								
								Extract rebuild_index method in maintenance CLI ( #28911 )  
							
							
							
						 
						
							2024-01-25 15:26:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0b38946c87 
								
							 
						 
						
							
							
								
								Update paperclip and climate_control gems ( #28379 )  
							
							
							
						 
						
							2024-01-25 15:18:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								17ea22671d 
								
							 
						 
						
							
							
								
								Fix Style/GuardClause cop in app/controllers ( #28420 )  
							
							
							
						 
						
							2024-01-25 15:13:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3205a654ca 
								
							 
						 
						
							
							
								
								Refactor conversations components in web UI ( #28833 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-01-25 14:34:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								274a48a9f4 
								
							 
						 
						
							
							
								
								Extract helper methods for db connection and table existence check in CLI::Maintenance task ( #28281 )  
							
							
							
						 
						
							2024-01-25 13:49:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2866106ec1 
								
							 
						 
						
							
							
								
								Reduce factory creation in spec/models/account_statuses_cleanup_policy ( #28361 )  
							
							
							
						 
						
							2024-01-25 13:37:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c8f59d2ca4 
								
							 
						 
						
							
							
								
								Fix Style/TernaryParentheses cop ( #28387 )  
							
							
							
						 
						
							2024-01-25 13:28:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ca7053f19c 
								
							 
						 
						
							
							
								
								Consolidate db test prep steps to rake task ( #28886 )  
							
							
							
						 
						
							2024-01-25 13:10:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59d2ea0d82 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #28899 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-01-25 13:00:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6b6586f5d0 
								
							 
						 
						
							
							
								
								Add CustomFilterKeyword#to_regex method ( #28893 )  
							
							
							
						 
						
							2024-01-25 13:00:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									renovate[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a69506a434 
								
							 
						 
						
							
							
								
								fix(deps): update dependency dotenv to v16.4.1 ( #28889 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-01-25 12:37:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c9c6c7f80 
								
							 
						 
						
							
							
								
								Fix remaining Rails/WhereExists cop violations, regenerate todo ( #28892 )  
							
							
							
						 
						
							2024-01-25 12:37:07 +00:00