Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream changes up to b7bdcd4f395aaa1e85930940975439d10b570f40 #2537

Merged
merged 54 commits into from
Dec 22, 2023
Merged

Merge upstream changes up to b7bdcd4f395aaa1e85930940975439d10b570f40 #2537

merged 54 commits into from
Dec 22, 2023

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Dec 21, 2023 •
edited
Loading

⚠️ Cookies and Rails cache format have changed. Zero-downtime rolling upgrades should be possible if you have already updated recently. Otherwise, stopping all services then starting them. See mastodon#27393 and mastodon#27392

Merge upstream changes up to b2f915b

Ported changes

Merge upstream changes up to f99e057

Conflicts

  • .rubocop_todo.yml:
    Took upstream's version of the conflicting lines.

Additional changes

Merge upstream changes up to 7d9b209

Conflicts

  • app/models/form/admin_settings.rb:
    Upstream changed code style change, including on a line modified by glitch-soc.
    Kept glitch-soc's line but with the code style change applied.

Merge upstream changes up to b7bdcd4

Skipped changes

  • 8b1eeb2 (already ported)
  • 3598c2e (commit never ported in the first place)

Postponed changes

ClearlyClaire and others added 30 commits December 12, 2023 12:00
@ClearlyClaire
Change Rails' cache format to 7.0 (mastodon#27393)
393e851
@ClearlyClaire
Change cookie rotator to use SHA1 digest for new cookies (mastodon#27392
f37c93f 
)
@renovate
Update dependency rubocop to v1.59.0 (mastodon#28320)
db3220f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Fix empty column explainer getting cropped under certain conditions (m…
3f1ec16 
…astodon#28337)
@ClearlyClaire
Fix N+1s because of association preloaders not actually getting called (
dcc24db 
mastodon#28339)
@renovate
Update dependency haml_lint to v0.52.0 (mastodon#28345)
aae4b56 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28344)
b2f915b 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
Update dependency ws to v8.15.1 (mastodon#28343)
49150e2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency test-prof to v1.3.1 (mastodon#28342)
3a59365 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Remove the stub_stdout wrapper around CLI specs (mastodon#28340)
8a3d8c6
@renovate
Update dependency chewy to v7.4.0 (mastodon#28349)
d791b47 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Improve spec coverage for models/announcement class (mastodon#28350)
28e1a7a
@mjankowski
Update stylelint to version 16.0.2 (mastodon#28354)
cd9ebf5
@mjankowski
Convert api/v1/directories controller spec to request spec (mastodo…
adbfd40 
…n#28356)
@mjankowski
Un-nest contexts in settings/2fa/webauthn spec (mastodon#28359)
ef9797a
@mjankowski
Fix reference to non-existent var in CLI maintenance command (mastodo…
1c3b5f4 
…n#28363)
@mjankowski
Move default meta options from InitialStateSerializer to private …
e17faed 
…method (AbcSize reduction) (mastodon#28355)
@mjankowski
Unwind map on single-item array in `spec/services/delete_account_se…
db897ea 
…rvice` spec (mastodon#28358)
@mjankowski
Assign a proc to Rack::Request.ip_filter instead of patching method (…
1ee8d1e 
…mastodon#28380)
@mjankowski
Fix Style/Lambda cop (mastodon#28378)
e5717c9
@mjankowski
Opt out of Rails/SkipsModelValidations cop in db/migrate (mastodon#…
3e336fe 
…28371)
@mjankowski
Fix Style/InverseMethods cop (mastodon#28377)
b1dec09
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28373)
f99e057 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
Update eslint (non-major) (mastodon#28408)
d099cf6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update DefinitelyTyped types (non-major) (mastodon#28407)
287384b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency rubocop-rails to v2.23.0 (mastodon#28396)
43f637c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency prom-client to v15.1.0 (mastodon#28394)
fad7dca 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency cssnano to v6.0.2 (mastodon#28382)
fc4eaa7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix Style/SymbolProc cop (mastodon#28386)
e56fb9e
@mjankowski
Fix Style/StderrPuts cop (mastodon#28389)
89d468a
mjankowski and others added 24 commits December 18, 2023 09:50
@mjankowski
Fix Style/RedundantReturn cop (mastodon#28391)
0e5b8fc
@mjankowski
Opt out of Rails/UnusedIgnoredColumns cop (mastodon#28385)
8e9e7d5
@mjankowski
Fix Style/SoleNestedConditional and Style/IfInsideElse cops, rege…
2bd8d34 
…nerate haml todo (mastodon#28384)
@mjankowski
Fix Performance/StringIdentifierArgument cop (mastodon#28399)
1820bad
@mjankowski
Opt out of Rails/NegateInclude cop (mastodon#28370)
0b42cf2
@renovate
Update dependency rubocop-performance to v1.20.0 (mastodon#28395)
b2ca71f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Add spec coverage for models/form/custom_emoji_batch class (mastodo…
af366f6 
…n#28388)
@ykzts
Group artifact actions (mastodon#28413)
f4b9c2b
@ClearlyClaire
Fix call to inefficient delete_matched cache method in domain blocks (
7d9b209 
mastodon#28374)
@renovate
Update dependency regenerator-runtime to v0.14.1 (mastodon#28393)
ab1201c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Typo fix in json ld helper spec (mastodon#28417)
476d123
@mjankowski
Fix rails mailer preview not honouring locale (mastodon#28418)
7cfc078
@renchap
Fix the loading bar with the new Redux actions (mastodon#28422)
8b1eeb2
@ClearlyClaire
Revert "Feature - Prevents multiple audio/video attachments from bein…
3598c2e 
…g played at the same time (mastodon#24717)" (mastodon#28251)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28423)
fa987db 
Co-authored-by: GitHub Actions <noreply@github.com>
@renchap
Fixes dropdown target without a buttonRef (edit history) (mastodon#…
7b1d390 
…28427)
@mjankowski
Handle negative offset param in api/v2/search (mastodon#28282)
c28976d
@renovate
Update dependency @material-symbols/svg-600 to v0.14.3 (mastodon#28276)
b7bdcd4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-s…
a60b9ac 
…oc/merge-upstream
@ClearlyClaire
[Glitch] Fix empty column explainer getting cropped under certain con…
7a0be26 
…ditions

Port 3f1ec16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-s…
f5b7307 
…oc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
@ClearlyClaire
Fix linting warning in glitch-soc-only migration
f2eb503
@ClearlyClaire
Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-s…
30ee733 
…oc/merge-upstream

Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
@ClearlyClaire
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-s…
92aa6e2 
…oc/merge-upstream
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes up to TODO Merge upstream changes up to b7bdcd4f395aaa1e85930940975439d10b570f40 Dec 21, 2023
@ClearlyClaire ClearlyClaire marked this pull request as ready for review December 21, 2023 20:25
@ClearlyClaire ClearlyClaire mentioned this pull request Dec 22, 2023
Open
@ClearlyClaire ClearlyClaire merged commit e676b57 into glitch-soc:main Dec 22, 2023
36 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ClearlyClaire @mjankowski @ykzts @renchap