Matt Jankowski 
							
						 
					 
					
						
						
							
						
						9ee83a9f3b 
					 
					
						
						
							
							Add policies and serializers groups to simplecov output ( #23897 )  
						
						 
						
						
						
						
					 
					
						2023-02-27 16:35:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						4bb39ac3c3 
					 
					
						
						
							
							Fix single-record invalid condition on PollVote ( #23810 )  
						
						 
						
						
						
						
					 
					
						2023-02-27 09:31:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						4ed09276d5 
					 
					
						
						
							
							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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						19614ba247 
					 
					
						
						
							
							Rename ActivityPub Serializer Specs ( #23844 )  
						
						 
						
						
						
						
					 
					
						2023-02-23 23:17:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						20b80c62ff 
					 
					
						
						
							
							Change auto-deletion throttling constants to better scale with server size ( #23320 )  
						
						 
						
						
						
						
					 
					
						2023-02-23 16:52:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						6bd7003799 
					 
					
						
						
							
							Fix mispelled spec filenames ( #23834 )  
						
						 
						
						
						
						
					 
					
						2023-02-23 11:28:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						3ed1b9ebb6 
					 
					
						
						
							
							Fix rack:attack flaky tests and test end of throttle period ( #23799 )  
						
						 
						
						
						
						
					 
					
						2023-02-22 10:28:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						8fd3fc404d 
					 
					
						
						
							
							Autofix Rubocop Rails/RootPathnameMethods ( #23760 )  
						
						 
						
						
						
						
					 
					
						2023-02-22 09:57:15 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						84cc805cae 
					 
					
						
						
							
							Enable Style/FrozenStringLiteralComment for specs ( #23790 )  
						
						 
						
						
						
						
					 
					
						2023-02-22 09:55:31 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						0cfdd1a401 
					 
					
						
						
							
							Enable Rubocop Style/StringConcatenation defaults ( #23792 )  
						
						 
						
						
						
						
					 
					
						2023-02-22 09:54:36 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						35d032500b 
					 
					
						
						
							
							Autofix Rubocop Security/IoMethods ( #23757 )  
						
						 
						
						
						
						
					 
					
						2023-02-21 03:21:19 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						2c3c734bcc 
					 
					
						
						
							
							Autofix Rubocop Style/SymbolProc ( #23742 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 07:58:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						717683d1c3 
					 
					
						
						
							
							Autofix Rubocop remaining Layout rules ( #23679 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 06:58:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						5116347eb7 
					 
					
						
						
							
							Autofix Rubocop RSpec/BeEq ( #23740 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 06:14:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						bf785df9fe 
					 
					
						
						
							
							Audofix Rubocop Style/WordArray ( #23739 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 06:14:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						4552685f6b 
					 
					
						
						
							
							Autofix Rubocop RSpec/LeadingSubject ( #23670 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 13:24:14 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						4ea1e0fceb 
					 
					
						
						
							
							Enable Rubocop RSpec/ExpectActual ( #23720 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 05:00:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						38a1d8bb85 
					 
					
						
						
							
							Autofix Rubocop RSpec/ImplicitSubject ( #23721 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 05:00:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						5179c47087 
					 
					
						
						
							
							Autofix Rubocops RSpec/ScatteredLet ( #23725 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 11:17:41 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						aef0051fd0 
					 
					
						
						
							
							Enable Rubocop HTTP status rules ( #23717 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 11:16:40 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						bd1d57c230 
					 
					
						
						
							
							Autofix Rubocop RSpec/EmptyLineAfterSubject ( #23719 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 02:46:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						dbc6d7b276 
					 
					
						
						
							
							Autofix Rubocop Lint/UnusedBlockArgument ( #23712 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 02:45:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						65ba0d92ef 
					 
					
						
						
							
							Enable Rubocop RSpec/NotToNot ( #23723 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 02:33:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						a2fdb388eb 
					 
					
						
						
							
							Autofix Rubocop RSpec/ReturnFromStub ( #23724 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 02:32:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						21bf326356 
					 
					
						
						
							
							Autofix Rubocop Rails/Pluck ( #23730 )  
						
						 
						
						
						
						
					 
					
						2023-02-20 02:28:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						7452a95998 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them. 
						
						
					 
					
						2023-02-19 10:42:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						e0e63b73ee 
					 
					
						
						
							
							Autofix Rubocop RSpec/EmptyLineAfterHook ( #23718 )  
						
						 
						
						
						
						
					 
					
						2023-02-19 14:54:34 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						81ad6c2e39 
					 
					
						
						
							
							Autofix Rubocop Style/StringLiterals ( #23695 )  
						
						 
						
						
						
						
					 
					
						2023-02-19 07:38:14 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						ac3561098e 
					 
					
						
						
							
							Autofix Rubocop RSpec/LetBeforeExamples ( #23671 )  
						
						 
						
						
						
						
					 
					
						2023-02-19 07:17:59 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						1a02101100 
					 
					
						
						
							
							Autofix Rubocop Style/EmptyLambdaParameter ( #23705 )  
						
						 
						
						
						
						
					 
					
						2023-02-19 07:12:06 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						3680e032b4 
					 
					
						
						
							
							Autofix Rubocop RSpec/EmptyLineAfterFinalLet ( #23707 )  
						
						 
						
						
						
						
					 
					
						2023-02-19 07:10:19 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						167709f6b0 
					 
					
						
						
							
							Autofix Rubocop Style/BlockDelimiters ( #23706 )  
						
						 
						
						
						
						
					 
					
						2023-02-19 07:00:17 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						c0d7c855b3 
					 
					
						
						
							
							Autofix Rubocop RSpec/Capybara/FeatureMethods ( #23708 )  
						
						 
						
						
						
						
					 
					
						2023-02-19 06:59:00 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						08289a38fa 
					 
					
						
						
							
							Autofix Rubocop Style/TrailingCommaInArrayLiteral ( #23692 )  
						
						 
						
						
						
						
					 
					
						2023-02-19 06:54:30 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						5069769cbe 
					 
					
						
						
							
							Autofix Rubocop Style/TrailingCommaInHashLiteral ( #23693 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 23:33:41 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						b4cbfff3eb 
					 
					
						
						
							
							Autofix Rubocop RSpec/ExcessiveDocstringSpacing ( #23666 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 12:47:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						c38bd17657 
					 
					
						
						
							
							Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 12:39:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						e2a3ebb271 
					 
					
						
						
							
							Autofix Rubocop Style/IfUnlessModifier ( #23697 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 12:37:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						d65b2c1924 
					 
					
						
						
							
							Apply Rubocop Style/RedundantConstantBase ( #23463 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 04:30:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						a7db0b41cd 
					 
					
						
						
							
							Autofix Rubocop Lint/ParenthesesAsGroupedExpression ( #23682 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 04:00:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						e5cf23cf3a 
					 
					
						
						
							
							Enable Rubocop RSpec/HooksBeforeExamples ( #23668 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 03:59:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						efd424506a 
					 
					
						
						
							
							Autofix Rubocop Style/RedundantPercentQ ( #23651 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 03:32:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						c0a645f647 
					 
					
						
						
							
							Autofix Rubocop RSpec/ExampleWording ( #23667 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 03:26:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						7a3d4c3d4b 
					 
					
						
						
							
							Enable Rubocop RSpec/MultipleDescribes ( #23672 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 03:25:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						54318dcd6d 
					 
					
						
						
							
							Autofix Rubocop RSpec/ClassCheck ( #23685 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 03:24:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						634368c491 
					 
					
						
						
							
							Autofix Rubocop Lint/SymbolConversion ( #23683 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 03:23:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						6d42820e5d 
					 
					
						
						
							
							Autofix Rubocop Lint/AmbiguousOperator ( #23680 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 03:22:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						ac59d6f19f 
					 
					
						
						
							
							Enable Rubocop Style/NumericLiterals ( #23647 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 11:05:57 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						669f6d2c0a 
					 
					
						
						
							
							Run rubocop formatting except line length ( #23632 )  
						
						 
						
						
						
						
					 
					
						2023-02-18 06:56:20 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Schonning 
							
						 
					 
					
						
						
							
						
						6ed6c41724 
					 
					
						
						
							
							Autofix Rubocop RSpec/EmptyLineAfterExample ( #23661 )  
						
						 
						
						
						
						
					 
					
						2023-02-17 21:46:00 +09:00