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 58ace2e45e16a69977267d03874568c11043f04c #2747

Merged
merged 11 commits into from
Jun 18, 2024
Merged

Merge upstream changes up to 58ace2e45e16a69977267d03874568c11043f04c #2747

merged 11 commits into from
Jun 18, 2024

Conversation

ClearlyClaire
Copy link

Ported changes

mjankowski and others added 11 commits June 18, 2024 12:16
@mjankowski
Remove unused Extractor#extract_cashtags_with_indices method (masto…
38c6825 
…don#30742)
@mjankowski
Remove already configured excludes from .rubocop.yml (mastodon#30741)
238dd23
@mjankowski
Remove comment for ruby-core-extracted gem (mastodon#30740)
7db3509
@renovate
fix(deps): update dependency sass to v1.77.6 (mastodon#30745)
81f95cf 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update docker/dockerfile docker tag to v1.8 (mastodon#30736
689ba28 
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30746)
50db95b 
Co-authored-by: GitHub Actions <[email protected]>
@renchap
Convert notifications policies frontend code to Typescript (mastodon#…
d558dfd 
…29868)
@vmstan
Build ffmpeg from source in Dockerfile (mastodon#30569)
d97fcd0
@ClearlyClaire
Fix SQL error in admin measures API (mastodon#30753)
58ace2e
@ClearlyClaire
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-s…
b0c979a 
…oc/merge-upstream
@renchap @ClearlyClaire
[Glitch] Convert notifications policies frontend code to Typescript
af0a1a8 
Port d558dfd to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review June 18, 2024 17:05
@ClearlyClaire ClearlyClaire merged commit 3bc513c into glitch-soc:main Jun 18, 2024
38 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 @mjankowski @renchap @vmstan