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.
10 months ago
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
10 months ago
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
10 months ago
17ea22671d
Fix `Style/GuardClause` cop in app/controllers ( #28420 )
10 months ago
c8f59d2ca4
Fix `Style/TernaryParentheses` cop ( #28387 )
10 months ago
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
10 months ago
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.
10 months ago
1290fede65
Fix `Rails/WhereExists` cop in app/lib ( #28862 )
10 months ago
9d413cbaf8
Fix `Rails/WhereExists` cop in app/models ( #28863 )
10 months ago
ceade78182
Fix `Rails/WhereExists` cop in app/services ( #28853 )
10 months ago
defe5f4076
Fix `Rails/WhereExists` cop in lib/tasks ( #28852 )
10 months ago
67f54c4e75
Fix `Rails/WhereExists` cop in app/validators ( #28854 )
10 months ago
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
10 months ago
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
10 months ago
5fc4ae7c5f
Move privacy policy into markdown file ( #28699 )
10 months ago
4ec7d7d989
Fix `Rails/WhereExists` cop in REST::TagSerializer model ( #28790 )
10 months ago
fd64817fbe
Fix `Rails/WhereExists` cop in app/lib/status_cache_hydrator ( #28808 )
10 months ago
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
10 months ago
9fb9ef418a
Fix `Rails/WhereExists` cop in User model ( #28792 )
10 months ago
da31792ac7
Fix `Rails/WhereExists` cop in FeaturedTag model ( #28791 )
10 months ago
89c9a4502d
Fix `Rails/WhereExists` cop in account/interactions concern ( #28789 )
10 months ago
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.
10 months ago
127503eb2c
Fix `Rails/RakeEnvironment` cop ( #28782 )
10 months ago
09f76c5c8d
Regenerate rubocop todo, removes last `Layout/LineLength` violation ( #28778 )
10 months ago
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
10 months ago
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
10 months ago
a2f02a0775
Disable `Rails/SkipsModelValidations` cop ( #28712 )
10 months ago
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.
10 months ago
28fdf93362
Disable `Rails/LexicallyScopedActionFilter` for inherited auth controllers ( #28711 )
10 months ago
575ab085be
Disable `Rails/ApplicationController` for `HealthController` ( #28705 )
10 months ago
2c70ca0674
Increase Metrics/AbcSize limit
10 months ago
e1b49d3454
Regenerate rubocop todo with version 1.59.0 ( #28597 )
10 months ago
ae39bed95b
Solve remaining `db/*migrate*` cops ( #28579 )
10 months ago
bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy ( #28470 )
11 months ago
a4d49c236d
Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service ( #28461 )
11 months ago
e6e217fedd
Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop ( #28462 )
11 months ago
513d35969e
Fix `RSpec/LetSetup` cop in auth controller specs ( #28464 )
11 months ago
9251779d75
Fix `RSpec/LetSetup` cop in spec/services ( #28459 )
11 months ago
efd16f3c2c
Clean up of `RSpec/LetSetup` within `spec/services/activitypub` ( #28445 )
11 months ago
c99f88e1a8
Clean up of `RSpec/LetSetup` within `spec/lib` ( #28447 )
11 months ago
cd64a5b2ec
Clean up of `RSpec/LetSetup` within `api/` ( #28448 )
11 months ago
f32d672d2f
Clean up of `RSpec/LetSetup` within `spec/controllers` ( #28446 )
11 months ago
c753b1ad35
Clean up of `RSpec/LetSetup` within `spec/models` ( #28444 )
11 months ago
0b42cf2979
Opt out of `Rails/NegateInclude` cop ( #28370 )
11 months ago
8e9e7d57d8
Opt out of `Rails/UnusedIgnoredColumns` cop ( #28385 )
11 months ago
0e5b8fc46b
Fix `Style/RedundantReturn` cop ( #28391 )
11 months ago
89d468ada7
Fix `Style/StderrPuts` cop ( #28389 )
11 months ago
e56fb9e489
Fix `Style/SymbolProc` cop ( #28386 )
11 months ago
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
11 months ago
3e336fe706
Opt out of `Rails/SkipsModelValidations` cop in db/migrate ( #28371 )
11 months ago
Claire
Matt Jankowski