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 57f592fed50747f3c97718a2761e17bafe6c8698 #2426

Merged
merged 36 commits into from
Sep 26, 2023
Merged

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698 #2426

merged 36 commits into from
Sep 26, 2023

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Sep 26, 2023 •
edited
Loading

Conflicts

None

Ported changes

Other change of interest

  • 57f592f has not been ported, as the plan is to share it between the two flavors

renchap and others added 30 commits September 22, 2023 10:13
@renchap
Ignore CVE-2023-26141 (Sidekiq) from bundler audit (mastodon#27037)
a011d3a
@renchap
Fix the search documentation URL in system checks (mastodon#27036)
4aaaf0d
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27052)
e824585 
Co-authored-by: GitHub Actions <noreply@github.com>
@ClearlyClaire
Fix ActiveRecord using two connection pools when no replica is defined (
39da3d8 
mastodon#27061)
@renchap
Improve modals reducer types (mastodon#26610)
b93ffb7
@renchap
Convert dropdown_menu state to Typescript (mastodon#25585)
4b7bc1f
@renovate
Update eslint (non-major) (mastodon#27113)
1fa40cf 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update Node.js to v20.7 (mastodon#27112)
a4c29a4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @reduxjs/toolkit to v1.9.6 (mastodon#27110)
c56d7d7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27080)
736fe75 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
Update dependency glob to v10.3.7 (mastodon#27078)
82c44f4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update DefinitelyTyped types (non-major) (mastodon#27109)
aeeddb9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@gunchleoc
Fix line wrapping of language selection button with long locale codes (…
88fa8e7 
…mastodon#27100)
@ClearlyClaire
Fix inefficient queries in “Follows and followers” as well as several…
1bd7455 
… admin pages (mastodon#27116)
@ClearlyClaire
Fix width of large text icon buttons (mastodon#27127)
38753ac
@ClearlyClaire
Add redirection on /deck URLs for logged-out users (mastodon#27128)
3de6dcf
@ClearlyClaire
Fix explore prompt sometimes showing up when the home TL is loading (m…
a001ae2 
…astodon#27062)
@ClearlyClaire
Fix division by zero in video in bitrate computation code (mastodon#2…
06444c8 
…7129)
@renovate
Update docker/build-push-action action to v5 (mastodon#27120)
cf9230f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update docker/login-action action to v3 (mastodon#27121)
19bc73b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update docker/metadata-action action to v5 (mastodon#27122)
8ea98aa 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update docker/setup-buildx-action action to v3 (mastodon#27123)
cdd8c4e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update docker/setup-qemu-action action to v3 (mastodon#27124)
530f486 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@TheEssem
Properly remove tIME chunk from PNG uploads (mastodon#27111)
bd81039
@renovate
Update dependency glob to v10.3.8 (mastodon#27145)
33a066a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27144)
5ea3e8e 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
Update dependency selenium-webdriver to v4.13.1 (mastodon#27141)
fdc9f97 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Update tootctl maintenance fix-duplicates to Mastodon v4.2.0 (masto…
82eaa26 
…don#27147)
@renovate
Update dependency glob to v10.3.9 (mastodon#27148)
2054ee7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renchap
Add Typescript types for some API objects (mastodon#26602)
57f592f
ClearlyClaire and others added 6 commits September 26, 2023 13:13
@ClearlyClaire
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-s…
abdb588 
…oc/merge-upstream
@renchap @ClearlyClaire
[Glitch] Improve modals reducer types
b2d67fb 
Port b93ffb7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@renchap @ClearlyClaire
[Glitch] Convert dropdown_menu state to Typescript
919ed0e 
Port 4b7bc1f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix explore prompt sometimes showing up when the home TL is …
02e6d9f 
…loading

Port a001ae2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@gunchleoc @ClearlyClaire
[Glitch] Fix line wrapping of language selection button with long loc…
ca7d169 
…ale codes

Port 88fa8e7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix width of large text icon buttons
1eeaa0d 
Port 38753ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review September 26, 2023 12:47
@ClearlyClaire ClearlyClaire merged commit fde89a8 into glitch-soc:main Sep 26, 2023
41 of 42 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 @renchap @gunchleoc @TheEssem