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/mastodon main branch #1512

Merged
merged 24 commits into from
Sep 18, 2024
Merged

Merge/mastodon main branch #1512

merged 24 commits into from
Sep 18, 2024

Conversation

S-H-GAMELINKS
Copy link
Owner

No description provided.

Gargron and others added 24 commits September 16, 2024 12:08
@Gargron
Fix horizontal scrollbar on who to follow carousel in web UI (mastodo…
efb0e2c 
…n#31912)
@ClearlyClaire
Rename /api/v2_alpha/notifications* to /api/v2/notifications* (ma…
e0648a9 
…stodon#31840)
@ClearlyClaire
Enable grouped notifications unconditionally (mastodon#31929)
c620452
@ClearlyClaire
Fix cancel follow request button sometimes saying “Follow back” (mast…
6c76a7a 
…odon#31934)
@ClearlyClaire
Fix selectSettingsNotificationsExcludedTypes not being memoized prope…
ca8e892 
…rly (mastodon#31881)
@vmstan
Fix background of text detection progress (mastodon#31943)
5a33a56
@ClearlyClaire
Increase no-gap-breakpoint by 32px to fix overflow (mastodon#31889)
d2f9075
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31946)
6a233cb 
Co-authored-by: GitHub Actions <[email protected]>
@oneiros @Gargron
Merge commit from fork
d8f9db5 
Co-authored-by: Eugen Rochko <[email protected]>
@ClearlyClaire
Bump version to 4.3.0-beta.2 (mastodon#31948)
3e91c10
@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)
@S-H-GAMELINKS
Merge remote-tracking branch 'mastodon/main' into merge/mastodon-main…
96cd34c 
…-branch
@S-H-GAMELINKS S-H-GAMELINKS merged commit 41abf9f into creatodon Sep 18, 2024
49 checks passed
@S-H-GAMELINKS S-H-GAMELINKS deleted the merge/mastodon-main-branch branch September 18, 2024 12:50
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.
7 participants
@S-H-GAMELINKS @Gargron @ClearlyClaire @vmstan @oneiros @mjankowski @c960657