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.
2 years ago
1cdd7d6c8f
Rename ActivityPub Serializer Specs ( #23844 )
2 years ago
bc4837a600
Change auto-deletion throttling constants to better scale with server size ( #23320 )
2 years ago
43a3812265
Fix mispelled spec filenames ( #23834 )
2 years ago
3423976bda
Fix rack:attack flaky tests and test end of throttle period ( #23799 )
2 years ago
eb6991cee1
Autofix Rubocop Rails/RootPathnameMethods ( #23760 )
2 years ago
dd46810e8a
Enable Style/FrozenStringLiteralComment for specs ( #23790 )
2 years ago
247bf6e812
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2 years ago
25cf99e513
Autofix Rubocop Security/IoMethods ( #23757 )
2 years ago
9376fccf91
Autofix Rubocop Style/SymbolProc ( #23742 )
2 years ago
e6312104c7
Autofix Rubocop remaining Layout rules ( #23679 )
2 years ago
a4cbfac4d9
Autofix Rubocop RSpec/BeEq ( #23740 )
2 years ago
c0f0c42326
Audofix Rubocop Style/WordArray ( #23739 )
2 years ago
754c417e29
Autofix Rubocop RSpec/LeadingSubject ( #23670 )
2 years ago
a1e0384fc5
Enable Rubocop RSpec/ExpectActual ( #23720 )
2 years ago
ac56c3971b
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2 years ago
0d47dee648
Autofix Rubocops RSpec/ScatteredLet ( #23725 )
2 years ago
ae51248ffe
Enable Rubocop HTTP status rules ( #23717 )
2 years ago
f6c4699d73
Autofix Rubocop RSpec/EmptyLineAfterSubject ( #23719 )
2 years ago
181617e3d9
Autofix Rubocop Lint/UnusedBlockArgument ( #23712 )
2 years ago
a25f6522da
Enable Rubocop RSpec/NotToNot ( #23723 )
2 years ago
1de4bdbaf4
Autofix Rubocop RSpec/ReturnFromStub ( #23724 )
2 years ago
b8f17330ea
Autofix Rubocop Rails/Pluck ( #23730 )
2 years ago
63992c6900
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.
2 years ago
e08a42e1d7
Autofix Rubocop RSpec/EmptyLineAfterHook ( #23718 )
2 years ago
be1ec56c6d
Autofix Rubocop Style/StringLiterals ( #23695 )
2 years ago
28b19386c1
Autofix Rubocop RSpec/LetBeforeExamples ( #23671 )
2 years ago
bfc66a0454
Autofix Rubocop Style/EmptyLambdaParameter ( #23705 )
2 years ago
a63cb79201
Autofix Rubocop RSpec/EmptyLineAfterFinalLet ( #23707 )
2 years ago
e9074c3eb5
Autofix Rubocop Style/BlockDelimiters ( #23706 )
2 years ago
2e4833b246
Autofix Rubocop RSpec/Capybara/FeatureMethods ( #23708 )
2 years ago
6988b04ec7
Autofix Rubocop Style/TrailingCommaInArrayLiteral ( #23692 )
2 years ago
4dc470fbee
Autofix Rubocop Style/TrailingCommaInHashLiteral ( #23693 )
2 years ago
a2129d336a
Autofix Rubocop RSpec/ExcessiveDocstringSpacing ( #23666 )
2 years ago
7f8439ee07
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2 years ago
793f8c7dd5
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2 years ago
bc31a28361
Apply Rubocop Style/RedundantConstantBase ( #23463 )
2 years ago
35dbf602f2
Autofix Rubocop Lint/ParenthesesAsGroupedExpression ( #23682 )
2 years ago
c402904fa1
Enable Rubocop RSpec/HooksBeforeExamples ( #23668 )
2 years ago
298f61ecef
Autofix Rubocop Style/RedundantPercentQ ( #23651 )
2 years ago
f8947c2042
Autofix Rubocop RSpec/ExampleWording ( #23667 )
2 years ago
24f4789d2b
Enable Rubocop RSpec/MultipleDescribes ( #23672 )
2 years ago
92d606bc98
Autofix Rubocop RSpec/ClassCheck ( #23685 )
2 years ago
a71a0802d6
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2 years ago
efcf9f0076
Autofix Rubocop Lint/AmbiguousOperator ( #23680 )
2 years ago
8fa4163574
Enable Rubocop Style/NumericLiterals ( #23647 )
2 years ago
31ca76fe2c
Run rubocop formatting except line length ( #23632 )
2 years ago
a45f8ff02d
Autofix Rubocop RSpec/EmptyLineAfterExample ( #23661 )
2 years ago
284a6902cc
Autofix Rubocop RSpec/BeNil ( #23653 )
2 years ago
c754596ce3
Autofix Rubocop Style/NestedParenthesizedCalls ( #23646 )
2 years ago
Claire
Nick Schonning