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 611533cd12059d365ca0267342b750e615637bd4 #2833

Merged
merged 17 commits into from
Sep 3, 2024
Merged

Merge upstream changes up to 611533cd12059d365ca0267342b750e615637bd4 #2833

merged 17 commits into from
Sep 3, 2024

Conversation

ClearlyClaire
Copy link

Ported changes

ClearlyClaire and others added 17 commits September 2, 2024 20:14
@ClearlyClaire
Fix not being able to load more notifications after trimming (mastodo…
c1795ee 
…n#31652)
@c960657
media_ids is an array of strings (mastodon#31709)
a5bbe83
@renovate
Update dependency rspec-rails to v7 (mastodon#31710)
5f7a395 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency inline_svg to v1.10.0 (mastodon#31717)
754baf0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31716)
e5155c5 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Use body_as_json directly instead of via local var assignment (mast…
24a0b20 
…odon#31696)
@mjankowski
Remove unused Mention#active? method (mastodon#31697)
406b821
@mjankowski
Remove unused User#inactive_message method (mastodon#31698)
48379e6
@mjankowski
Remove unused helper method in spec (mastodon#31699)
25bbb01
@mjankowski
Add coverage for JsonLdHelper#uri_from_bearcap method (mastodon#31700)
b895724
@renovate
Update libretranslate/libretranslate Docker tag to v1.6.0 (mastodon#3…
3efe98a 
…1687)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Remove unused merge_context helper (mastodon#31703)
2a244e2
@mjankowski
Add first pass coverage for AnnualReport class (mastodon#31704)
31c0010
@mjankowski
Remove config/secrets.yml file (mastodon#31562)
4819fc7
@renovate
Update dependency json-schema to v5 (mastodon#31499)
611533c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-s…
ac4002f 
…oc/merge-upstream
@ClearlyClaire
[Glitch] Fix not being able to load more notifications after trimming
e9adba6 
Port c1795ee to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review September 3, 2024 10:42
@ClearlyClaire ClearlyClaire merged commit c461a6a into glitch-soc:main Sep 3, 2024
34 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.
3 participants
@ClearlyClaire @c960657 @mjankowski