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 02633d6ebbe944a8769c8f2229fa9e0d6c7d1142 #2829

Merged
merged 25 commits into from
Aug 31, 2024
Merged

Merge upstream changes up to 02633d6ebbe944a8769c8f2229fa9e0d6c7d1142 #2829

merged 25 commits into from
Aug 31, 2024

Conversation

ClearlyClaire
Copy link

Ported changes

mjankowski and others added 25 commits August 28, 2024 07:56
@mjankowski
Convert instance_actor controller spec to request spec (mastodon#31621
00586d2 
)
@mjankowski
Convert shares controller spec to system spec (mastodon#31619)
0ef636f
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31627)
26d6d29 
Co-authored-by: GitHub Actions <noreply@github.com>
@HolgerHuo
update: max_media_attachments follow server advertised value (mastodo…
3c41257 
…n#31616)
@ThisIsMissEm
Streaming: Fix BIND IPv6 handling (mastodon#31624)
f6fb9b7
@renovate
Update opentelemetry-ruby (non-major) (mastodon#31646)
dc7412c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency flatware-rspec to v2.3.3 (mastodon#31636)
099657b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency selenium-webdriver to v4.24.0 (mastodon#31633)
8bd8238 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @rails/ujs to v7.1.400 (mastodon#31628)
4f4be65 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31647)
5d725b2 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Convert admin/reset controller spec to system spec (mastodon#31643)
b9269c8
@mjankowski
Convert media controller spec to request spec (mastodon#31634)
02585d8
@mjankowski
Use MediaAttachment.supported_mime_types method where relevant (mas…
662f87d 
…todon#31635)
@ClearlyClaire
Add grouped_types parameter to allow clients to restrict which noti…
ad0a28a 
…fications types get grouped (mastodon#31594)
@renovate
Update dependency thor to v1.3.2 (mastodon#31654)
b0a3096 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31656)
92eba90 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Convert admin/announcements controller spec to system spec (mastodo…
1ee1c32 
…n#31655)
@ClearlyClaire
Fix inconsistencies between code and notification source translation …
35538fe 
…strings (mastodon#31658)
@ClearlyClaire
Change background color of notifications on private messages (mastodo…
3ddeaca 
…n#31657)
@mjankowski
Use rails configuration storage for paperclip path (mastodon#31651)
85e8d1f
@renovate
Update dependency @babel/runtime to v7.25.6 (mastodon#31649)
3655e32 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency jsdom to v25 (mastodon#31578)
02633d6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-s…
6f35e93 
…oc/merge-upstream
@ClearlyClaire
[Glitch] Fix inconsistencies between code and notification source tra…
4f1da81 
…nslation strings

Port 35538fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Change background color of notifications on private messages
ee2c38f 
Port 3ddeaca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review August 31, 2024 14:39
@ClearlyClaire ClearlyClaire merged commit a859b0c into glitch-soc:main Aug 31, 2024
35 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 @HolgerHuo @ThisIsMissEm