Matt Jankowski
75f9c652e2
Fix `Bundler/OrderedGems` cop ( #28400 )
2024-04-18 16:24:22 +00:00
Matt Jankowski
0d9ad96d3f
Rename `PremailerWebpackStrategy` -> `PremailerBundledAssetStrategy` ( #29934 )
2024-04-15 09:16:59 +00:00
Matt Jankowski
bf5d948237
Fix `Style/SingleArgumentDig` cop in webpacker/manifest_extensions ( #29929 )
2024-04-15 09:15:32 +00:00
Matt Jankowski
a7b637768e
Regenerate rubocop todo with version 1.62.1 ( #29830 )
2024-04-02 19:56:54 +00:00
Claire
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
Claire
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
Matt Jankowski
79b4b94f3a
Configure `CountAsOne` value for `RSpec/ExampleLength` cop ( #29115 )
2024-02-07 14:54:40 +00:00
Matt Jankowski
978fdc71ca
Reduce expectation count in example from `ProcessAccountService` spec ( #29100 )
2024-02-06 13:04:02 +00:00
Claire
bf153b384b
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
2024-01-27 19:06:41 +01:00
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Matt Jankowski
17ea22671d
Fix `Style/GuardClause` cop in app/controllers ( #28420 )
2024-01-25 15:13:41 +00:00
Matt Jankowski
c8f59d2ca4
Fix `Style/TernaryParentheses` cop ( #28387 )
2024-01-25 13:28:49 +00:00
Matt Jankowski
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
Claire
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
Matt Jankowski
1290fede65
Fix `Rails/WhereExists` cop in app/lib ( #28862 )
2024-01-24 11:51:09 +00:00
Matt Jankowski
9d413cbaf8
Fix `Rails/WhereExists` cop in app/models ( #28863 )
2024-01-24 09:57:49 +00:00
Matt Jankowski
ceade78182
Fix `Rails/WhereExists` cop in app/services ( #28853 )
2024-01-23 11:41:34 +00:00
Matt Jankowski
defe5f4076
Fix `Rails/WhereExists` cop in lib/tasks ( #28852 )
2024-01-23 09:07:22 +00:00
Matt Jankowski
67f54c4e75
Fix `Rails/WhereExists` cop in app/validators ( #28854 )
2024-01-23 09:06:53 +00:00
Claire
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
Claire
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
Matt Jankowski
5fc4ae7c5f
Move privacy policy into markdown file ( #28699 )
2024-01-19 11:22:23 +00:00
Matt Jankowski
4ec7d7d989
Fix `Rails/WhereExists` cop in REST::TagSerializer model ( #28790 )
2024-01-19 09:35:58 +00:00
Matt Jankowski
fd64817fbe
Fix `Rails/WhereExists` cop in app/lib/status_cache_hydrator ( #28808 )
2024-01-19 09:19:48 +00:00
Claire
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
Matt Jankowski
9fb9ef418a
Fix `Rails/WhereExists` cop in User model ( #28792 )
2024-01-18 13:55:44 +00:00
Matt Jankowski
da31792ac7
Fix `Rails/WhereExists` cop in FeaturedTag model ( #28791 )
2024-01-18 12:22:12 +00:00
Matt Jankowski
89c9a4502d
Fix `Rails/WhereExists` cop in account/interactions concern ( #28789 )
2024-01-18 09:36:16 +00:00
Claire
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
Matt Jankowski
127503eb2c
Fix `Rails/RakeEnvironment` cop ( #28782 )
2024-01-17 16:33:17 +00:00
Matt Jankowski
09f76c5c8d
Regenerate rubocop todo, removes last `Layout/LineLength` violation ( #28778 )
2024-01-17 15:42:13 +00:00
Claire
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
Claire
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
Matt Jankowski
a2f02a0775
Disable `Rails/SkipsModelValidations` cop ( #28712 )
2024-01-15 13:46:47 +00:00
Claire
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
Matt Jankowski
28fdf93362
Disable `Rails/LexicallyScopedActionFilter` for inherited auth controllers ( #28711 )
2024-01-12 13:10:14 +00:00
Matt Jankowski
575ab085be
Disable `Rails/ApplicationController` for `HealthController` ( #28705 )
2024-01-12 09:08:17 +00:00
Claire
2c70ca0674
Increase Metrics/AbcSize limit
2024-01-10 18:03:31 +01:00
Matt Jankowski
e1b49d3454
Regenerate rubocop todo with version 1.59.0 ( #28597 )
2024-01-05 12:26:31 +00:00
Matt Jankowski
ae39bed95b
Solve remaining `db/*migrate*` cops ( #28579 )
2024-01-04 16:40:28 +00:00
Matt Jankowski
bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy ( #28470 )
2023-12-22 15:29:50 +00:00
Matt Jankowski
a4d49c236d
Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service ( #28461 )
2023-12-22 12:57:29 +00:00
Matt Jankowski
e6e217fedd
Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop ( #28462 )
2023-12-22 08:32:27 +00:00
Matt Jankowski
513d35969e
Fix `RSpec/LetSetup` cop in auth controller specs ( #28464 )
2023-12-22 08:03:59 +00:00
Matt Jankowski
9251779d75
Fix `RSpec/LetSetup` cop in spec/services ( #28459 )
2023-12-21 14:23:53 +00:00
Matt Jankowski
efd16f3c2c
Clean up of `RSpec/LetSetup` within `spec/services/activitypub` ( #28445 )
2023-12-21 11:20:12 +00:00
Matt Jankowski
c99f88e1a8
Clean up of `RSpec/LetSetup` within `spec/lib` ( #28447 )
2023-12-21 11:19:56 +00:00
Matt Jankowski
cd64a5b2ec
Clean up of `RSpec/LetSetup` within `api/` ( #28448 )
2023-12-21 10:10:18 +00:00
Matt Jankowski
f32d672d2f
Clean up of `RSpec/LetSetup` within `spec/controllers` ( #28446 )
2023-12-21 09:28:41 +00:00
Matt Jankowski
c753b1ad35
Clean up of `RSpec/LetSetup` within `spec/models` ( #28444 )
2023-12-21 09:18:38 +00:00
Matt Jankowski
0b42cf2979
Opt out of `Rails/NegateInclude` cop ( #28370 )
2023-12-18 12:21:45 +00:00
Matt Jankowski
8e9e7d57d8
Opt out of `Rails/UnusedIgnoredColumns` cop ( #28385 )
2023-12-18 09:58:53 +00:00
Matt Jankowski
0e5b8fc46b
Fix `Style/RedundantReturn` cop ( #28391 )
2023-12-18 09:50:51 +00:00
Matt Jankowski
89d468ada7
Fix `Style/StderrPuts` cop ( #28389 )
2023-12-18 09:36:08 +00:00
Matt Jankowski
e56fb9e489
Fix `Style/SymbolProc` cop ( #28386 )
2023-12-18 09:32:02 +00:00
Matt Jankowski
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
2023-12-15 15:52:00 +00:00
Matt Jankowski
3e336fe706
Opt out of `Rails/SkipsModelValidations` cop in db/migrate ( #28371 )
2023-12-15 14:38:12 +00:00
Matt Jankowski
e5717c9bc6
Fix `Style/Lambda` cop ( #28378 )
2023-12-15 14:34:24 +00:00
Matt Jankowski
e17faedffb
Move default `meta` options from `InitialStateSerializer` to private method (AbcSize reduction) ( #28355 )
2023-12-14 14:04:55 +00:00
Matt Jankowski
f70f39dd04
Add explicit `dependent: nil` to associations ( #28169 )
2023-12-01 15:52:47 +00:00
Matt Jankowski
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00
Matt Jankowski
35deaaf90b
Reduce AbcSize complexity in `InitialStateSerializer` ( #27782 )
2023-11-30 15:41:26 +00:00
Matt Jankowski
a1636fce7f
Move lib/devise/* to lib/devise/strategies/* ( #27638 )
2023-11-29 10:10:21 +00:00
Matt Jankowski
31bef99b9e
Move lib/mastodon/premailer_webpack_strategy to lib/ ( #27636 )
2023-11-29 10:08:55 +00:00
Matt Jankowski
b2c5b20ef2
Fix `RSpec/AnyInstance` cop ( #27810 )
2023-11-14 14:52:59 +00:00
Matt Jankowski
63c9102f8a
Fix `RSpec/MessageChain` cop ( #27776 )
2023-11-09 12:57:23 +00:00
Matt Jankowski
c9204b792c
Fix `Rails/I18nLocaleTexts` cop ( #27779 )
2023-11-09 09:46:39 +00:00
Matt Jankowski
c875dfc90b
Fix `Lint/UnusedBlockArgument` cop ( #27777 )
2023-11-09 09:43:26 +00:00
Matt Jankowski
69d00e2721
Fix `RSpec/InstanceVariable` cop ( #27766 )
2023-11-08 15:42:30 +00:00
Matt Jankowski
ce91d14d48
Fix `Style/WordArray` cop ( #27770 )
2023-11-08 13:03:44 +00:00
Matt Jankowski
33cc3ae8fa
Fix `Style/StabbyLambdaParentheses` cop ( #27771 )
2023-11-08 12:01:18 +00:00
Matt Jankowski
dc0bf87090
Remove unused before block from settings/branding spec ( #27759 )
2023-11-07 15:19:17 +00:00
Matt Jankowski
45770c9306
Fix `Performance/MapMethodChain` cop ( #27744 )
2023-11-07 13:01:09 +00:00
Matt Jankowski
bbad5b6456
Remove false positive cop detection ( #27457 )
2023-11-07 10:44:15 +00:00
Matt Jankowski
49e2772064
Fix `RSpec/MessageSpies` cop ( #27751 )
2023-11-07 09:46:28 +00:00
Matt Jankowski
2d39268bc5
Fix `Lint/OrAssignmentToConstant` cop ( #27750 )
2023-11-07 09:11:50 +00:00
Matt Jankowski
cfa14ec6d1
Fix `Lint/EmptyBlock` cop ( #27748 )
2023-11-07 09:11:04 +00:00
Matt Jankowski
b06284c572
Fix `RSpec/HookArgument` cop ( #27747 )
2023-11-07 09:10:36 +00:00
Matt Jankowski
beee9ea991
Fix `RSpec/LetSetup` cop in spec/controllers/admin area ( #27619 )
2023-10-31 08:22:19 +00:00
Matt Jankowski
4fdc548fa5
Regenerate lint todos ( #27513 )
2023-10-24 08:08:31 +00:00
Daniel M Brasil
26d2a2a0cc
Migrate to request specs in `/api/v1/media` ( #25543 )
2023-10-23 15:46:21 +00:00
Matt Jankowski
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
2023-10-19 16:55:06 +02:00
Matt Jankowski
a1b27d8b61
Fix `Naming/VariableNumber` cop ( #27447 )
2023-10-18 14:26:22 +02:00
Matt Jankowski
63a2a4b074
Fix `Performance/DeletePrefix` cop ( #27448 )
2023-10-18 10:32:09 +02:00
Matt Jankowski
08a376cbcb
Fix `Style/CombinableLoops` cop ( #27429 )
2023-10-16 16:36:28 +02:00
Daniel M Brasil
d9caa6ed24
Migrate to request specs in `/api/v1/admin/accounts` ( #25563 )
2023-10-16 15:49:12 +02:00
Daniel M Brasil
bc6cd27d9e
Migrate to request specs in `/api/v1/followed_tags` ( #25472 )
2023-10-13 14:43:50 +02:00
Matt Jankowski
c676bc91e9
Dont match mention in url query string ( #25656 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-03 17:01:45 +02:00
Nick Schonning
85db392464
Autofix Rubocop cops for config/ ( #24145 )
2023-10-03 15:24:12 +02:00
Matt Jankowski
56c0babc0b
Fix rubocop `Layout/ArgumentAlignment` cop ( #26060 )
2023-09-28 15:48:47 +02:00
Claire
a04ae16201
Fix CSP when using `ONE_CLICK_SSO_LOGIN` ( #26901 )
2023-09-13 19:54:04 +02:00
Nick Schonning
b970ed6098
Update rubocop and rubocop-rspec ( #26329 )
2023-08-22 09:31:40 +02:00
CSDUMMI
120f5802c0
Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )
2023-08-03 16:43:15 +02:00
Emelia Smith
e258b4cb64
Refactor: replace whitelist_mode mentions with limited_federation_mode ( #26252 )
2023-08-02 19:32:48 +02:00
Matt Jankowski
6f1fa1364f
Fix `RSpec/EmptyExampleGroup` cop ( #24735 )
2023-07-28 23:15:33 +02:00
Matt Jankowski
ad81be6c8e
Update rubocop rules for linelength ( #26190 )
2023-07-28 23:11:45 +02:00
Matt Jankowski
30f5ec7303
Rubocop fix: `Perfomance/UnfreezeString` ( #26217 )
2023-07-28 23:11:05 +02:00
Daniel M Brasil
812a84ff5f
Migrate to request specs in `/api/v2/filters` ( #25721 )
2023-07-27 14:58:20 +02:00
Matt Jankowski
b06763dc11
Remove the `sr` locale override .rb files ( #25927 )
2023-07-26 15:39:53 +02:00