kouhai dev
ee1dc4a0d1
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
kouhai dev
da1aa87c6f
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
kouhai dev
705fd6c182
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
kouhai dev
a936e75d02
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Claire
a95dc48e01
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
Matt Jankowski
35cbd0685d
Fix deprecation warning about merging conditions ( #23618 )
2023-03-02 16:21:04 +01:00
Matt Jankowski
0d409f9fd7
Update rspec-rails to version 6.0.1 ( #23908 )
2023-03-02 15:55:37 +01:00
Matt Jankowski
0fe721074b
Add spec coverage for Admin::Trends::StatusesHelper ( #23898 )
2023-03-02 15:30:40 +01:00
Stanislav Dobrovolschii
eaea285368
Add rspecs for FollowRecommendationsScheduler ( #23890 )
2023-03-02 10:05:05 +01:00
Matt Jankowski
5bf8f34842
Spec coverage for HomeHelper ( #23907 )
2023-03-02 10:04:14 +01:00
Matt Jankowski
04082726de
Admin mailer spec coverage improvement ( #23863 )
2023-02-28 22:33:34 +09:00
Matt Jankowski
7e7fa6cb40
Add policies and serializers groups to simplecov output ( #23897 )
2023-02-27 16:35:47 +01:00
Matt Jankowski
385ae6681d
Fix single-record invalid condition on PollVote ( #23810 )
2023-02-27 09:31:15 +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
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
Nick Schonning
43a3812265
Fix mispelled spec filenames ( #23834 )
2023-02-23 11:28:56 +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
eb6991cee1
Autofix Rubocop Rails/RootPathnameMethods ( #23760 )
2023-02-22 09:57:15 +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
Nick Schonning
25cf99e513
Autofix Rubocop Security/IoMethods ( #23757 )
2023-02-21 03:21:19 +09:00
Nick Schonning
9376fccf91
Autofix Rubocop Style/SymbolProc ( #23742 )
2023-02-20 07:58:46 +01:00
Nick Schonning
e6312104c7
Autofix Rubocop remaining Layout rules ( #23679 )
2023-02-20 06:58:28 +01:00
Nick Schonning
a4cbfac4d9
Autofix Rubocop RSpec/BeEq ( #23740 )
2023-02-20 06:14:50 +01:00
Nick Schonning
c0f0c42326
Audofix Rubocop Style/WordArray ( #23739 )
2023-02-20 06:14:10 +01:00
Nick Schonning
754c417e29
Autofix Rubocop RSpec/LeadingSubject ( #23670 )
2023-02-20 13:24:14 +09:00
Nick Schonning
a1e0384fc5
Enable Rubocop RSpec/ExpectActual ( #23720 )
2023-02-20 05:00:59 +01:00
Nick Schonning
ac56c3971b
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2023-02-20 05:00:48 +01:00
Nick Schonning
0d47dee648
Autofix Rubocops RSpec/ScatteredLet ( #23725 )
2023-02-20 11:17:41 +09:00
Nick Schonning
ae51248ffe
Enable Rubocop HTTP status rules ( #23717 )
2023-02-20 11:16:40 +09:00
Nick Schonning
f6c4699d73
Autofix Rubocop RSpec/EmptyLineAfterSubject ( #23719 )
2023-02-20 02:46:00 +01:00
Nick Schonning
181617e3d9
Autofix Rubocop Lint/UnusedBlockArgument ( #23712 )
2023-02-20 02:45:50 +01:00
Nick Schonning
a25f6522da
Enable Rubocop RSpec/NotToNot ( #23723 )
2023-02-20 02:33:27 +01:00
Nick Schonning
1de4bdbaf4
Autofix Rubocop RSpec/ReturnFromStub ( #23724 )
2023-02-20 02:32:10 +01:00
Nick Schonning
b8f17330ea
Autofix Rubocop Rails/Pluck ( #23730 )
2023-02-20 02:28:40 +01:00
Claire
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.
2023-02-19 10:42:55 +01:00
Nick Schonning
e08a42e1d7
Autofix Rubocop RSpec/EmptyLineAfterHook ( #23718 )
2023-02-19 14:54:34 +09:00
Nick Schonning
be1ec56c6d
Autofix Rubocop Style/StringLiterals ( #23695 )
2023-02-19 07:38:14 +09:00
Nick Schonning
28b19386c1
Autofix Rubocop RSpec/LetBeforeExamples ( #23671 )
2023-02-19 07:17:59 +09:00
Nick Schonning
bfc66a0454
Autofix Rubocop Style/EmptyLambdaParameter ( #23705 )
2023-02-19 07:12:06 +09:00
Nick Schonning
a63cb79201
Autofix Rubocop RSpec/EmptyLineAfterFinalLet ( #23707 )
2023-02-19 07:10:19 +09:00
Nick Schonning
e9074c3eb5
Autofix Rubocop Style/BlockDelimiters ( #23706 )
2023-02-19 07:00:17 +09:00
Nick Schonning
2e4833b246
Autofix Rubocop RSpec/Capybara/FeatureMethods ( #23708 )
2023-02-19 06:59:00 +09:00
Nick Schonning
6988b04ec7
Autofix Rubocop Style/TrailingCommaInArrayLiteral ( #23692 )
2023-02-19 06:54:30 +09:00
Nick Schonning
4dc470fbee
Autofix Rubocop Style/TrailingCommaInHashLiteral ( #23693 )
2023-02-18 23:33:41 +09:00
Nick Schonning
a2129d336a
Autofix Rubocop RSpec/ExcessiveDocstringSpacing ( #23666 )
2023-02-18 12:47:37 +01:00
Nick Schonning
7f8439ee07
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2023-02-18 12:39:58 +01:00
Nick Schonning
793f8c7dd5
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2023-02-18 12:37:47 +01:00
Nick Schonning
bc31a28361
Apply Rubocop Style/RedundantConstantBase ( #23463 )
2023-02-18 04:30:03 +01:00