b2ca71f733
Update dependency rubocop-performance to v1.20.0 ( #28395 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 12:41:22 +00:00
0b42cf2979
Opt out of `Rails/NegateInclude` cop ( #28370 )
2023-12-18 12:21:45 +00:00
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
2023-12-18 13:20:08 +01:00
18856371be
Merge pull request #2520 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to f476d9dab2
2023-12-18 13:19:45 +01:00
1820bad646
Fix `Performance/StringIdentifierArgument` cop ( #28399 )
2023-12-18 10:26:09 +00:00
2bd8d343cf
Fix `Style/SoleNestedConditional` and `Style/IfInsideElse` cops, regenerate haml todo ( #28384 )
2023-12-18 10:06:42 +00:00
8e9e7d57d8
Opt out of `Rails/UnusedIgnoredColumns` cop ( #28385 )
2023-12-18 09:58:53 +00:00
0e5b8fc46b
Fix `Style/RedundantReturn` cop ( #28391 )
2023-12-18 09:50:51 +00:00
89d468ada7
Fix `Style/StderrPuts` cop ( #28389 )
2023-12-18 09:36:08 +00:00
e56fb9e489
Fix `Style/SymbolProc` cop ( #28386 )
2023-12-18 09:32:02 +00:00
fc4eaa779a
Update dependency cssnano to v6.0.2 ( #28382 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:31:21 +00:00
fad7dca0e4
Update dependency prom-client to v15.1.0 ( #28394 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:29:41 +00:00
43f637c130
Update dependency rubocop-rails to v2.23.0 ( #28396 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:28:19 +00:00
287384b3bb
Update DefinitelyTyped types (non-major) ( #28407 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:28:10 +00:00
d099cf67c0
Update eslint (non-major) ( #28408 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:28:06 +00:00
f99e05710e
New Crowdin Translations (automated) ( #28373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-18 08:25:21 +00:00
33dd5d8179
Fix Ruby lint issues
2023-12-17 23:17:55 +01:00
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
c8fe36c349
Merge pull request #2517 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3bf896c973
2023-12-17 20:06:18 +01:00
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
2023-12-17 18:03:22 +01:00
bb4fa0c374
[Glitch] Rewrite `AutosuggestTextarea` as Functional Component
...
Port 9c8891b39a
2023-12-17 17:59:33 +01:00
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
2023-12-17 17:50:31 +01:00
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
537b88330d
Merge pull request #2514 from ClearlyClaire/glitch-soc/main
...
Merge upstream changes up to a916251d8a
2023-12-17 17:42:22 +01:00
f62bafc7a1
Fix HAML linting issue
2023-12-17 16:37:11 +01:00
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
2023-12-15 15:52:00 +00:00
3e336fe706
Opt out of `Rails/SkipsModelValidations` cop in db/migrate ( #28371 )
2023-12-15 14:38:12 +00:00
e5717c9bc6
Fix `Style/Lambda` cop ( #28378 )
2023-12-15 14:34:24 +00:00
1ee8d1e50e
Assign a proc to `Rack::Request.ip_filter` instead of patching method ( #28380 )
2023-12-15 14:33:56 +00:00
db897eaa5a
Unwind `map` on single-item array in `spec/services/delete_account_service` spec ( #28358 )
2023-12-14 14:07:54 +00:00
e17faedffb
Move default `meta` options from `InitialStateSerializer` to private method (AbcSize reduction) ( #28355 )
2023-12-14 14:04:55 +00:00
1c3b5f4a78
Fix reference to non-existent var in CLI maintenance command ( #28363 )
2023-12-14 14:02:33 +00:00
ef9797a395
Un-nest contexts in `settings/2fa/webauthn` spec ( #28359 )
2023-12-14 10:46:43 +00:00
adbfd40a1b
Convert `api/v1/directories` controller spec to request spec ( #28356 )
2023-12-14 10:38:06 +00:00
cd9ebf5f0f
Update stylelint to version 16.0.2 ( #28354 )
2023-12-14 10:35:54 +00:00
28e1a7a394
Improve spec coverage for `models/announcement` class ( #28350 )
2023-12-14 10:29:10 +00:00
d791b47058
Update dependency chewy to v7.4.0 ( #28349 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-14 10:26:28 +00:00
8a3d8c6c14
Remove the `stub_stdout` wrapper around CLI specs ( #28340 )
2023-12-13 10:14:19 +00:00
3a59365e40
Update dependency test-prof to v1.3.1 ( #28342 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-13 09:52:43 +00:00
49150e2f1d
Update dependency ws to v8.15.1 ( #28343 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-13 09:52:40 +00:00
b2f915b31a
New Crowdin Translations (automated) ( #28344 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-13 09:52:37 +00:00
aae4b5644f
Update dependency haml_lint to v0.52.0 ( #28345 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-13 09:52:33 +00:00
dcc24db793
Fix N+1s because of association preloaders not actually getting called ( #28339 )
2023-12-13 07:47:32 +00:00
b7248485b1
Merge pull request #2477 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2e6bf60f15
2023-12-12 19:45:18 +01:00
3f1ec16377
Fix empty column explainer getting cropped under certain conditions ( #28337 )
2023-12-12 14:31:37 +00:00
db3220ff77
Update dependency rubocop to v1.59.0 ( #28320 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-12 14:18:30 +00:00
f37c93f3d7
Change cookie rotator to use SHA1 digest for new cookies ( #27392 )
2023-12-12 12:01:08 +00:00
393e851649
Change Rails' cache format to 7.0 ( #27393 )
2023-12-12 12:00:23 +00:00
4a7395d989
Add `migrator_version` method to CLI maintenance script ( #28323 )
2023-12-12 11:56:39 +00:00
renovate[bot]