treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

merge-2023-07-07 #63

Merged
ariadne merged 12 commits from merge-2023-07-07 into main 2023-07-07 22:13:37 +00:00
Conversation 0 Commits 12 Files Changed 9
ariadne commented 2023-07-07 21:58:14 +00:00
Owner
There is no content yet.
ariadne added 12 commits 2023-07-07 21:58:15 +00:00
8b624553ef
Update dependency sanitize to v6.0.2 [SECURITY] (#25777) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
b9aa228c54 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version.
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
3169677598 Merge gitea.treehouse.systems:mirrors/mastodon-glitch into merge-2023-07-07
ariadne merged commit 9bbf23f8e0 into main 2023-07-07 22:13:37 +00:00
ariadne deleted branch merge-2023-07-07 2023-07-07 22:13:43 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
area/i18n

Internationalization   
area/infrastructure

Infrastructure and operations   
area/moderation & safety
   
area/ux

User experience   
priority/1.high
   
priority/2.medium
   
priority/3.low
   
tag/upstream issue

This issue should be filed against upstream   
tag/duplicate

This issue or pull request already exists   
tag/help wanted

Feedback and pull requests welcome!   
tag/invalid

Something is wrong   
tag/won't fix

This won't be fixed   
type/bug

Something is not working   
type/enhancement

New feature   
type/question

More information is needed
No Label
area/i18n
area/infrastructure
area/moderation & safety
area/ux
priority/1.high
priority/2.medium
priority/3.low
tag/upstream issue
tag/duplicate
tag/help wanted
tag/invalid
tag/won't fix
type/bug
type/enhancement
type/question
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: treehouse/mastodon#63
There is no content yet.
Delete Branch "merge-2023-07-07"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?