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 3178acc5cb8415a72b646dbe77be05255d3966f3 #2953

Merged
merged 17 commits into from
Jan 23, 2025
Merged

Merge upstream changes up to 3178acc5cb8415a72b646dbe77be05255d3966f3 #2953

merged 17 commits into from
Jan 23, 2025

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Jan 22, 2025 •
edited
Loading

Ported changes

ShadowJonathan and others added 10 commits January 22, 2025 08:31
@ShadowJonathan
Order emoji categories (in admin interface) by name (mastodon#33630)
e380e80
@renovate
Update dependency irb to v1.15.1 (mastodon#33674)
2a6a418 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use expect for nested params in more controllers (mastodon#33675)
d2cc288
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33679)
38c27a7 
Co-authored-by: GitHub Actions <[email protected]>
@Gargron
Refactor <DomainPill> into TypeScript (mastodon#33680)
8b24085
@mjankowski
Use expect for nested params in settings/* controllers (mastodon#…
e155aab 
…33673)
@ShadowJonathan
Change first_of_value to first_of_hash, and add more test cases (m…
b18caff 
…astodon#33647)
@mjankowski
Use expect for api/v1 and api/web push subs controllers (mastodon#3…
607f65a 
…3682)
@ClearlyClaire
Fix WebUI crash when language detection code returns undefined (mas…
8dcfd3f 
…todon#33683)
@ClearlyClaire
Change mastodon:setup to prevent overwriting already-configured ser…
a6fc776 
…vers (mastodon#33684)
@ClearlyClaire ClearlyClaire marked this pull request as ready for review January 22, 2025 17:17
@ClearlyClaire ClearlyClaire marked this pull request as draft January 22, 2025 21:01
mjankowski and others added 6 commits January 23, 2025 09:04
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes up to a6fc776c6ff99f9900b88ff84ce8232372a7b2de Merge upstream changes up to 3178acc5cb8415a72b646dbe77be05255d3966f3 Jan 23, 2025
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 2267575 to 45093e7 Compare January 23, 2025 12:40
@ClearlyClaire ClearlyClaire marked this pull request as ready for review January 23, 2025 16:39
@ClearlyClaire ClearlyClaire merged commit 43e1a24 into glitch-soc:main Jan 23, 2025
36 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 @ShadowJonathan @mjankowski @Gargron