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 1229d2907a4a7ee09ee42cd24043d74561507e0a #2800

Merged
merged 16 commits into from
Jul 29, 2024
Merged

Merge upstream changes up to 1229d2907a4a7ee09ee42cd24043d74561507e0a #2800

merged 16 commits into from
Jul 29, 2024

Conversation

ClearlyClaire
Copy link

No conflicts.

Ported changes

renovate bot and others added 16 commits July 29, 2024 08:06
@renovate
chore(deps): update eslint (non-major) (mastodon#31188)
90d6297 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency husky to v9.1.3 (mastodon#31185)
cefd8b5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency use-debounce to v10.0.2 (mastodon#31177)
4cc634d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency sanitize to v6.1.2 (mastodon#31172)
37f5718 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@vmstan
Follow up tweaking of admin UI changes (mastodon#31168)
848a5ca
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31169)
ec5a860 
Co-authored-by: GitHub Actions <noreply@github.com>
@kyori19
Fix Codespaces startup fails due to Corepack download prompt (mastodo…
6ad477d 
…n#31189)
@mjankowski
Extrude fill_in_auth_details method to ProfileStories spec suppor…
95eadab 
…t module (mastodon#31163)
@renovate
chore(deps): update dependency typescript to v5.5.4 (mastodon#31186)
8edd77a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@vmstan
Adjust magick version detection in admin panel (mastodon#30845)
91fbd5b
@renovate
chore(deps): update dependency pg to v1.5.7 (mastodon#31176)
6d2ed0d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ThisIsMissEm
Implement UI for Admin Search of Hashtags (mastodon#30880)
c40e481
@renovate
chore(deps): update docker/dockerfile docker tag to v1.9 (mastodon#31187
1229d29 
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-s…
654187a 
…oc/merge-upstream
@vmstan @ClearlyClaire
[Glitch] Follow up tweaking of admin UI changes
eae81d3 
Port 848a5ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ThisIsMissEm @ClearlyClaire
[Glitch] Implement UI for Admin Search of Hashtags
ceb7972 
Port SCSS changes from c40e481 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review July 29, 2024 17:49
@ClearlyClaire ClearlyClaire merged commit 25c6b52 into glitch-soc:main Jul 29, 2024
37 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 @vmstan @kyori19 @mjankowski @ThisIsMissEm