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.
2 years ago
19614ba247
Rename ActivityPub Serializer Specs ( #23844 )
2 years ago
20b80c62ff
Change auto-deletion throttling constants to better scale with server size ( #23320 )
2 years ago
6bd7003799
Fix mispelled spec filenames ( #23834 )
2 years ago
3ed1b9ebb6
Fix rack:attack flaky tests and test end of throttle period ( #23799 )
2 years ago
8fd3fc404d
Autofix Rubocop Rails/RootPathnameMethods ( #23760 )
2 years ago
84cc805cae
Enable Style/FrozenStringLiteralComment for specs ( #23790 )
2 years ago
0cfdd1a401
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2 years ago
35d032500b
Autofix Rubocop Security/IoMethods ( #23757 )
2 years ago
2c3c734bcc
Autofix Rubocop Style/SymbolProc ( #23742 )
2 years ago
717683d1c3
Autofix Rubocop remaining Layout rules ( #23679 )
2 years ago
5116347eb7
Autofix Rubocop RSpec/BeEq ( #23740 )
2 years ago
bf785df9fe
Audofix Rubocop Style/WordArray ( #23739 )
2 years ago
4552685f6b
Autofix Rubocop RSpec/LeadingSubject ( #23670 )
2 years ago
4ea1e0fceb
Enable Rubocop RSpec/ExpectActual ( #23720 )
2 years ago
38a1d8bb85
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2 years ago
5179c47087
Autofix Rubocops RSpec/ScatteredLet ( #23725 )
2 years ago
aef0051fd0
Enable Rubocop HTTP status rules ( #23717 )
2 years ago
bd1d57c230
Autofix Rubocop RSpec/EmptyLineAfterSubject ( #23719 )
2 years ago
dbc6d7b276
Autofix Rubocop Lint/UnusedBlockArgument ( #23712 )
2 years ago
65ba0d92ef
Enable Rubocop RSpec/NotToNot ( #23723 )
2 years ago
a2fdb388eb
Autofix Rubocop RSpec/ReturnFromStub ( #23724 )
2 years ago
21bf326356
Autofix Rubocop Rails/Pluck ( #23730 )
2 years ago
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.
2 years ago
e0e63b73ee
Autofix Rubocop RSpec/EmptyLineAfterHook ( #23718 )
2 years ago
81ad6c2e39
Autofix Rubocop Style/StringLiterals ( #23695 )
2 years ago
ac3561098e
Autofix Rubocop RSpec/LetBeforeExamples ( #23671 )
2 years ago
1a02101100
Autofix Rubocop Style/EmptyLambdaParameter ( #23705 )
2 years ago
3680e032b4
Autofix Rubocop RSpec/EmptyLineAfterFinalLet ( #23707 )
2 years ago
167709f6b0
Autofix Rubocop Style/BlockDelimiters ( #23706 )
2 years ago
c0d7c855b3
Autofix Rubocop RSpec/Capybara/FeatureMethods ( #23708 )
2 years ago
08289a38fa
Autofix Rubocop Style/TrailingCommaInArrayLiteral ( #23692 )
2 years ago
5069769cbe
Autofix Rubocop Style/TrailingCommaInHashLiteral ( #23693 )
2 years ago
b4cbfff3eb
Autofix Rubocop RSpec/ExcessiveDocstringSpacing ( #23666 )
2 years ago
c38bd17657
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2 years ago
e2a3ebb271
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2 years ago
d65b2c1924
Apply Rubocop Style/RedundantConstantBase ( #23463 )
2 years ago
a7db0b41cd
Autofix Rubocop Lint/ParenthesesAsGroupedExpression ( #23682 )
2 years ago
e5cf23cf3a
Enable Rubocop RSpec/HooksBeforeExamples ( #23668 )
2 years ago
efd424506a
Autofix Rubocop Style/RedundantPercentQ ( #23651 )
2 years ago
c0a645f647
Autofix Rubocop RSpec/ExampleWording ( #23667 )
2 years ago
7a3d4c3d4b
Enable Rubocop RSpec/MultipleDescribes ( #23672 )
2 years ago
54318dcd6d
Autofix Rubocop RSpec/ClassCheck ( #23685 )
2 years ago
634368c491
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2 years ago
6d42820e5d
Autofix Rubocop Lint/AmbiguousOperator ( #23680 )
2 years ago
ac59d6f19f
Enable Rubocop Style/NumericLiterals ( #23647 )
2 years ago
669f6d2c0a
Run rubocop formatting except line length ( #23632 )
2 years ago
6ed6c41724
Autofix Rubocop RSpec/EmptyLineAfterExample ( #23661 )
2 years ago
68b1071f86
Autofix Rubocop RSpec/BeNil ( #23653 )
2 years ago
936204b9ea
Autofix Rubocop Style/NestedParenthesizedCalls ( #23646 )
2 years ago
Claire
Nick Schonning