Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								3bb32113c8 
								
							 
						 
						
							
							
								
								th: use {RAILS,NODE}_ENV=development when running webpack-dev-server with Foreman  
							
							
							
						 
						
							2023-04-22 00:38:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								da1aa87c6f 
								
							 
						 
						
							
							
								
								th: Merge remote-tracking branch 'glitch/main'  
							
							
							
						 
						
							2023-04-22 00:38:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								228f9c72d4 
								
							 
						 
						
							
							
								
								th: update models, node/Gemfile state  
							
							
							
						 
						
							2023-04-22 00:38:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								705fd6c182 
								
							 
						 
						
							
							
								
								th: Merge remote-tracking branch 'glitch/main'  
							
							
							
						 
						
							2023-04-22 00:38:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								a936e75d02 
								
							 
						 
						
							
							
								
								th: Merge remote-tracking branch 'glitch/main'  
							
							
							
						 
						
							2023-04-22 00:38:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								4de0440c46 
								
							 
						 
						
							
							
								
								th: consistent dividers  
							
							
							
						 
						
							2023-04-22 00:38:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kouhai 
								
							 
						 
						
							
							
							
							
								
							
							
								4f30ab5515 
								
							 
						 
						
							
							
								
								th: add deps rake tasks  
							
							
							
						 
						
							2023-04-22 00:38:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								8d645954fa 
								
							 
						 
						
							
							
								
								Merge pull request  #2119  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-02-26 15:06:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								42f73a411c 
								
							 
						 
						
							
							
								
								Move misc rules from components/index.scss to components/misc.scss  
							
							
							
						 
						
							2023-02-25 23:47:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								59b7c6e3d8 
								
							 
						 
						
							
							
								
								Fix glitch-soc SCSS code style and refactor closer to upstream  
							
							
							
						 
						
							2023-02-25 23:46:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2e98a75c36 
								
							 
						 
						
							
							
								
								Add glitch-soc's win95.scss and reset.scss to stylelint's ingore list  
							
							
							
						 
						
							2023-02-25 23:45:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								5eaad2ae5b 
								
							 
						 
						
							
							
								
								[Glitch] Add lang attribute to preview card  
							
							... 
							
							
							
							Port e56145661c 
							
						 
						
							2023-02-25 14:43:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								650ea1316a 
								
							 
						 
						
							
							
								
								[Glitch] Increase contrast of upload progress background  
							
							... 
							
							
							
							Port 808c9a7cf4 
							
						 
						
							2023-02-25 14:43:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Botao Wang 
								
							 
						 
						
							
							
							
							
								
							
							
								213b82d0a4 
								
							 
						 
						
							
							
								
								[Glitch] Fix sidebar cut-off on small screens in admin UI  
							
							... 
							
							
							
							Port 1f844d0d18 
							
						 
						
							2023-02-25 14:40:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5548b2c73f 
								
							 
						 
						
							
							
								
								[Glitch] Add lang tag to native language names in language picker  
							
							... 
							
							
							
							Port 82c464d4d0 
							
						 
						
							2023-02-25 14:37:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								295d193e7f 
								
							 
						 
						
							
							
								
								[Glitch] Rename JSX files with proper .jsx extension  
							
							... 
							
							
							
							Port ae3812d182 
							
						 
						
							2023-02-25 14:35:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f3cd30942c 
								
							 
						 
						
							
							
								
								Fix building vanilla flavor after JSX change  
							
							
							
						 
						
							2023-02-25 14:28:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f15ded319f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them. 
							
						 
						
							2023-02-25 14:00:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								c759d6f31d 
								
							 
						 
						
							
							
								
								Remove unused HTML Validator ( #23866 )  
							
							
							
						 
						
							2023-02-24 20:06:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								e56145661c 
								
							 
						 
						
							
							
								
								Add lang attribute to preview card ( #23869 )  
							
							
							
						 
						
							2023-02-24 20:04:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								1cdd7d6c8f 
								
							 
						 
						
							
							
								
								Rename ActivityPub Serializer Specs ( #23844 )  
							
							
							
						 
						
							2023-02-23 23:17:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bc4837a600 
								
							 
						 
						
							
							
								
								Change auto-deletion throttling constants to better scale with server size ( #23320 )  
							
							
							
						 
						
							2023-02-23 16:52:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								808c9a7cf4 
								
							 
						 
						
							
							
								
								Increase contrast of upload progress background ( #23836 )  
							
							
							
						 
						
							2023-02-23 12:58:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								43a3812265 
								
							 
						 
						
							
							
								
								Fix mispelled spec filenames ( #23834 )  
							
							
							
						 
						
							2023-02-23 11:28:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6bfb54dccc 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23625 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-22 21:16:02 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0fb32f919f 
								
							 
						 
						
							
							
								
								Fix inefficiency when searching accounts per username in admin interface ( #23801 )  
							
							
							
						 
						
							2023-02-22 11:53:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3423976bda 
								
							 
						 
						
							
							
								
								Fix rack:attack flaky tests and test end of throttle period ( #23799 )  
							
							
							
						 
						
							2023-02-22 10:28:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								4f6ad6475e 
								
							 
						 
						
							
							
								
								Autofix Rubocop Rails/Blank ( #23765 )  
							
							
							
						 
						
							2023-02-22 09:57:56 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								eb6991cee1 
								
							 
						 
						
							
							
								
								Autofix Rubocop Rails/RootPathnameMethods ( #23760 )  
							
							
							
						 
						
							2023-02-22 09:57:15 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								3e43bc352d 
								
							 
						 
						
							
							
								
								Ignore JSX files from Prettier ( #23777 )  
							
							
							
						 
						
							2023-02-22 09:56:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								dd46810e8a 
								
							 
						 
						
							
							
								
								Enable Style/FrozenStringLiteralComment for specs ( #23790 )  
							
							
							
						 
						
							2023-02-22 09:55:31 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								247bf6e812 
								
							 
						 
						
							
							
								
								Enable Rubocop Style/StringConcatenation defaults ( #23792 )  
							
							
							
						 
						
							2023-02-22 09:54:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								f5f5144098 
								
							 
						 
						
							
							
								
								Bump @babel/plugin-proposal-decorators from 7.20.13 to 7.21.0 ( #23769 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 11:35:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								3ba636994b 
								
							 
						 
						
							
							
								
								Bump @babel/plugin-transform-react-inline-elements from 7.18.6 to 7.21.0 ( #23766 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 11:14:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								e504d9acd2 
								
							 
						 
						
							
							
								
								Bump @babel/plugin-transform-runtime from 7.19.6 to 7.21.0 ( #23774 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 10:59:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								78149d75ed 
								
							 
						 
						
							
							
								
								Bump @babel/core from 7.20.12 to 7.21.0 ( #23767 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 10:46:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								ee1b61708d 
								
							 
						 
						
							
							
								
								Bump @babel/runtime from 7.20.13 to 7.21.0 ( #23773 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 10:44:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								185e7aa9ea 
								
							 
						 
						
							
							
								
								Bump devise from 4.8.1 to 4.9.0 ( #23691 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 10:41:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Botao Wang 
								
							 
						 
						
							
							
							
							
								
							
							
								1f844d0d18 
								
							 
						 
						
							
							
								
								Fix sidebar cut-off on small screens in admin UI ( #23764 )  
							
							
							
						 
						
							2023-02-21 10:06:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								6d0c21f315 
								
							 
						 
						
							
							
								
								Bump stylelint from 15.1.0 to 15.2.0 ( #23770 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 09:41:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								62c75cb70d 
								
							 
						 
						
							
							
								
								Bump blurhash from 2.0.4 to 2.0.5 ( #23771 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 09:33:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								f0ac124c03 
								
							 
						 
						
							
							
								
								Bump sass from 1.58.2 to 1.58.3 ( #23772 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 09:30:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								227be00a33 
								
							 
						 
						
							
							
								
								Bump capistrano from 3.17.1 to 3.17.2 ( #23775 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-02-21 09:29:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								82c464d4d0 
								
							 
						 
						
							
							
								
								Add lang tag to native language names in language picker ( #23749 )  
							
							
							
						 
						
							2023-02-21 09:23:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								a0e4d69c12 
								
							 
						 
						
							
							
								
								Autofix Rubocop Rails/FindById ( #23762 )  
							
							
							
						 
						
							2023-02-21 10:21:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f954abb690 
								
							 
						 
						
							
							
								
								Merge pull request  #2117  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-02-20 22:41:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								25cf99e513 
								
							 
						 
						
							
							
								
								Autofix Rubocop Security/IoMethods ( #23757 )  
							
							
							
						 
						
							2023-02-21 03:21:19 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								eed0829d3f 
								
							 
						 
						
							
							
								
								Autofix Rubocop Rails/WhereEquals ( #23759 )  
							
							
							
						 
						
							2023-02-21 03:20:56 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b5b0bc17e8 
								
							 
						 
						
							
							
								
								Change compose form checkbox to native input with appearance: none ( #22949 )  
							
							
							
						 
						
							2023-02-20 11:32:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								4ec6b389fa 
								
							 
						 
						
							
							
								
								Update rebase needed job settings ( #23746 )  
							
							
							
						 
						
							2023-02-20 11:02:06 +01:00