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 5dfdec645313e556413147597138a8008bc35996 #2853

Merged
merged 24 commits into from
Sep 24, 2024
Merged

Merge upstream changes up to 5dfdec645313e556413147597138a8008bc35996 #2853

merged 24 commits into from
Sep 24, 2024

Conversation

ClearlyClaire
Copy link

Ported changes

renovate bot and others added 24 commits September 23, 2024 08:35
@renovate
Update dependency react-intl to v6.7.0 (mastodon#32028)
efc0d4d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update libretranslate/libretranslate Docker tag to v1.6.1 (mastodon#3…
f294c4a 
…2027)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update DefinitelyTyped types (non-major) (mastodon#32026)
84d0438 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency jsdom to v25.0.1 (mastodon#32017)
c37f9c0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.164.0 (mastodon#32010)
f4632d9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sass to v1.79.3 (mastodon#32009)
958f01e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency selenium-webdriver to v4.25.0 (mastodon#32008)
10d2f83 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Gargron
Fix OAuth authorization prompt referring to third-party apps (mastodo…
5fae1d5 
…n#32005)
@mjankowski
Combine repeated parsed_body assertions into single (mastodon#32002)
e0b45b3
@mjankowski
Remove body_json_ids from api/v2/admin/accounts spec (mastodon#32003)
0ba3ad4
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32011)
ed90d93 
Co-authored-by: GitHub Actions <[email protected]>
@timetinytim
Feature more otel customization (mastodon#31998)
11eae69
@renovate
Update Yarn to v4.5.0 (mastodon#31914)
770ec92 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Update dependency google-protobuf (mastodon#32029)
5d6a3f2
@mjankowski
Reduce factory creation in User#reset_password! spec (mastodon#32021)
cd7b670
@mjankowski
Move status creation to "with rss" context in accounts request spec (m…
66ed7ea 
…astodon#32020)
@mjankowski
Remove double no-records cases in api/v1/admin req specs (mastodon#…
447d0a3 
…32014)
@mjankowski
Add response_avatar_link helper to webfinger request spec (mastodon…
2b4bda8 
…#31999)
@mjankowski
Combine assertions in Notification model spec (mastodon#32015)
bbf7752
@ClearlyClaire
Change mobile breakpoint back to old version and allow main column to…
b5bdc69 
… shrink (mastodon#32033)
@Gargron
Add reblogs and favourites counts to statuses in ActivityPub (mastodo…
aaab6b7 
…n#32007)
@mjankowski
Convert settings/applications controller spec to system/request spe…
5dfdec6 
…cs (mastodon#32006)
@ClearlyClaire
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-s…
c2c3a66 
…oc/merge-upstream
@ClearlyClaire
[Glitch] Change mobile breakpoint back to old version and allow main …
38744a4 
…column to shrink

Port b5bdc69 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review September 23, 2024 19:39
@ClearlyClaire ClearlyClaire merged commit 6551129 into glitch-soc:main Sep 24, 2024
35 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 @Gargron @mjankowski @timetinytim