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 7ed9c590b98610f8d68deab9ef8df260eec6d8f0 #2850

Merged
merged 52 commits into from
Sep 21, 2024
Merged

Merge upstream changes up to 7ed9c590b98610f8d68deab9ef8df260eec6d8f0 #2850

merged 52 commits into from
Sep 21, 2024

Conversation

ClearlyClaire
Copy link

renovate bot and others added 30 commits September 18, 2024 08:05
@renovate
Update dependency babel-loader to v8.4.1 (mastodon#31931)
f3f06da 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Move non-action public method controller callback to private methods (m…
a397141 
…astodon#31933)
@renovate
Update dependency memory_profiler to v1.1.0 (mastodon#31947)
b7548db 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31959)
bd86c69 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update dependency dotenv to v3.1.4 (mastodon#31953)
6f3d751 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Remove unneeded to_s on Link header comparison in statuses contro…
9437386 
…ller spec (mastodon#31941)
@mjankowski
Use have_http_link_header matcher in api/v1/trends/* specs (masto…
eb16763 
…don#31940)
@renovate
Update dependency sass to v1.79.1 (mastodon#31958)
a791274 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@c960657
Mute XHR abort errors (mastodon#31952)
7740f1a
@renovate
Update dependency pg-connection-string to v2.7.0 (mastodon#31950)
2d399f5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Remove unused E2EE messaging code (mastodon#31193)
5405bdd
@mjankowski
Remove crypto values from doorkeeper application/token scopes (ma…
6f836c4 
…stodon#31945)
@mjankowski
Convert controller spec for security_key_options endpoint to request …
bf8eaaa 
…spec (mastodon#31938)
@renovate
Update dependency pg to v8.13.0 (mastodon#31949)
42f9f50 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Add coverage for AccountDeletionRequest class (mastodon#31937)
e3baa1c
@renchap
Fix the appearance of avatars when they do not load (mastodon#31966)
8b70834
@Gargron
Fix sass deprecation warning (mastodon#31961)
29656cb
@ClearlyClaire
Fix rolling updates by moving DropEndToEndMessageTables to post-deplo…
62a39d6 
…yment migrations (mastodon#31963)
@renovate
Update dependency puma to v6.4.3 (mastodon#31975)
90db524 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.163.0 (mastodon#31972)
1fce55c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Combine API request spec assertions (mastodon#31970)
b071e61
@mjankowski
Remove unused E2EE-related methods (mastodon#31964)
5d573c9
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31974)
efdc175 
Co-authored-by: GitHub Actions <[email protected]>
@Gargron
Fix browser glitch caused by two overlapping scroll animations in web…
ef4d6ab 
… UI (mastodon#31960)
@renovate @oneiros
Update dependency devise-two-factor to v6 [SECURITY] (mastodon#31957)
6801afa 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Roetzel <[email protected]>
@mjankowski
Use headers shorthand in mailers (mastodon#31956)
2946a92
@mjankowski
Convert settings/exports controller spec to system/request specs (m…
5a8f2fe 
…astodon#31965)
@ClearlyClaire
Fix custom history.push and history.replace building bogus locati…
57a38f0 
…on if path is omitted (mastodon#31980)
@renchap
Update directory page options to use URL params (mastodon#31977)
ae03e4f
@renovate
Update dependency react-select to v5.8.1 (mastodon#31982)
09459ed 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
mjankowski and others added 22 commits September 20, 2024 08:16
@mjankowski
Capture actual behavior in v2/notifications "someone else" dismiss sc…
9a03902 
…enario (mastodon#31985)
@renovate
Update dependency sass to v1.79.2 (mastodon#31992)
840fd69 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31993)
162f9a3 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Add LIMIT constant for api/v1/peers/search endpoint (mastodon#31989)
c922af2
@mjankowski
Add reviewed and unreviewed scopes to Reviewable model concern (m…
04a939d 
…astodon#31988)
@Gargron
Change zoom icon in web UI (mastodon#29683)
e7fd098
@ClearlyClaire
Change Mastodon to issue correctly-signed queries by default (mastodo…
8afa3bb 
…n#31994)
@mjankowski @ClearlyClaire
Move default embed size knowledge into OEmbedSerializer (mastodon#3…
bdf83c3 
…1990)

Co-authored-by: Claire <[email protected]>
@mjankowski
Use heredoc/squish for inline css styles in oembed serializer (mastod…
a7dbf6f 
…on#31991)
@mjankowski
Add response.content_type checks for JSON to api/v1 request specs (…
6632606 
…mastodon#31981)
@mjankowski
Add coverage for CSV responses for severed relationships (mastodon#31962
171394e 
)
@mjankowski
Add content type checks to api/v2 request specs (mastodon#31983)
d55f4fb
@ClearlyClaire
Fix links for reblogs in moderation interface (mastodon#31979)
ed8b0e4
@ClearlyClaire
Fix issue when encountering reblog of deleted post in feed rebuild (m…
7ed9c59 
…astodon#32001)
@ClearlyClaire
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-s…
221bba1 
…oc/merge-upstream
@c960657 @ClearlyClaire
[Glitch] Mute XHR abort errors
0820cbc 
Port 7740f1a to glitch-soc

Signed-off-by: Claire <[email protected]>
@renchap @ClearlyClaire
[Glitch] Fix the appearance of avatars when they do not load
d77348f 
Port 8b70834 to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Fix sass deprecation warning
80cb285 
Port 29656cb to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Fix browser glitch caused by two overlapping scroll animatio…
9bd5838 
…ns in web UI

Port ef4d6ab to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix custom history.push and history.replace building bog…
86b9d3b 
…us location if path is omitted

Port 57a38f0 to glitch-soc

Signed-off-by: Claire <[email protected]>
@renchap @ClearlyClaire
[Glitch] Update directory page options to use URL params
03829d8 
Port ae03e4f to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Change zoom icon in web UI
a969c6a 
Port e7fd098 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review September 21, 2024 14:34
@ClearlyClaire ClearlyClaire merged commit 5aebdc9 into glitch-soc:main Sep 21, 2024
34 of 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.
5 participants
@ClearlyClaire @mjankowski @c960657 @renchap @Gargron