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 5652ca613582df03e5b838626078981414f3b897 #2727

Merged
merged 47 commits into from
Jun 6, 2024
Merged

Merge upstream changes up to 5652ca613582df03e5b838626078981414f3b897 #2727

merged 47 commits into from
Jun 6, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Jun 6, 2024 •
edited
Loading

This adds support for processing media with libvips instead of ImageMagick, enabled by default in the Docker builds, but otherwise requiring MASTODON_USE_LIBVIPS=true.

Ported changes

None

Skipped changes

  • 3c435f9 I do not think this is a good idea, though we could do that and put it behind a glitch-soc preference

renovate bot and others added 30 commits May 30, 2024 14:41
@renovate
fix(deps): update dependency sass to v1.77.3 (mastodon#30476)
ad3e200 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency concurrent-ruby to v1.3.1 (mastodon#30473
a1430b7 
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency node to 20.14 (mastodon#30459)
00f4d9d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30477)
a0b525e 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Move pagination_params into API::BaseController (mastodon#28845)
85d9053
@renovate
chore(deps): update dependency rubocop to v1.64.1 (mastodon#30500)
ced7007 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency ruby to v3.3.2 (mastodon#30480)
9533a86 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency sass to v1.77.4 (mastodon#30496)
543fa26 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30499)
dac4eba 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Add :email to filter parameter logging config (mastodon#30492)
a22865a
@mjankowski
Use more direct attribute handling in User fabricator (mastodon#30495)
4d047b9
@shleeable
Change default ruby version to 3.3.2 (mastodon#30478)
64d69eb
@renovate
chore(deps): update dependency propshaft to v0.9.0 (mastodon#30382)
e20a579 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renchap
Revert "Change default ruby version to 3.3.2 (mastodon#30478)" (masto…
d326ad0 
…don#30506)
@mjankowski
Fix rack attack match_type value typo in logging config (mastodon#3…
4d3748a 
…0514)
@mjankowski
Update current_user override mode description in controllers (masto…
469de92 
…don#30515)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30517)
aa9b80f 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
chore(deps): update devdependencies (non-major) (mastodon#30526)
6e92a9b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update eslint (non-major) (mastodon#30527)
db49b0e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Add experimental server-side notification grouping (mastodon#29889)
974335e
@mjankowski
Use existing config access to local_domain value (mastodon#30509)
249cbc4
@shleeable
Revert "Revert "Change default ruby version to 3.3.2 (mastodon#30478)…
91b6502 
…"" (mastodon#30516)
@mjankowski
Use bundler version 2.5.11 (mastodon#30508)
d4e0949
@nschonni
Cleanup leftover Nanobox references (mastodon#30550)
9ab7e66
@vmstan
Set Devcontainer to Ruby 3.3 Bookworm (mastodon#30548)
7d9a8c9
@filippog
Add libvirt provider parameters to Vagrant (mastodon#28102)
e5984c9 
Co-authored-by: Filippo Giunchedi <[email protected]>
@renovate
chore(deps): update dependency rails to v7.1.3.4 (mastodon#30551)
f40f3cb 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency pg to v8.12.0 (mastodon#30549)
1d3b75d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency rubocop-rspec to v2.30.0 (mastodon#30529)
f3893ae 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30543)
e4e3875 
Co-authored-by: GitHub Actions <[email protected]>
renovate bot and others added 17 commits June 5, 2024 07:56
@renovate
chore(deps): update dependency pghero to v3.5.0 (mastodon#30393)
048f9b9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ThisIsMissEm
Add url validation to Web::PushSubscription endpoints (mastodon#30540)
eef2cc0
@renovate
fix(deps): update dependency cssnano to v7.0.2 (mastodon#30560)
20e490b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Gargron @ClearlyClaire
Add support for libvips in addition to ImageMagick (mastodon#30090)
5f15a89 
Co-authored-by: Claire <[email protected]>
@ThisIsMissEm
Fix add validation to webpush subscription keys (mastodon#30542)
4655be0
@Gargron
Change counters to be displayed on profile timelines in web UI (masto…
3c435f9 
…don#30525)
@mjankowski
Clarify the purpose of separate Docker resources (mastodon#30568)
569b7d2
@ThisIsMissEm @ClearlyClaire
Change read:me scope to profile scope (mastodon#30357)
e02d23b 
Co-authored-by: Claire <[email protected]>
@mjankowski
Fix empty aria-hidden attribute value in logo resources area (masto…
2fdd782 
…don#30570)
@mjankowski
Remove deprecated version value from `.devcontainer/docker-compose.ym…
d72714e 
…l` (mastodon#30567)
@Gargron
Add timeline of public posts about a trending link to REST API (masto…
a2505e8 
…don#30381)
@mjankowski
Run as root in devcontainer from vscode (mastodon#30574)
2f0a34a
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30575)
a729104 
Co-authored-by: GitHub Actions <[email protected]>
@fabiosammy
Clear the docker setup - Deprecate post-create.sh and use bin/setup (m…
cd4b008 
…astodon#30502)
@renovate
fix(deps): update babel monorepo to v7.24.7 (mastodon#30561)
5652ca6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-s…
30b00ca 
…oc/merge-upstream
@ClearlyClaire
Fix /api/v1/timelines/link specs for glitch-soc default settings
578b0ea
@ClearlyClaire ClearlyClaire marked this pull request as ready for review June 6, 2024 15:57
@ClearlyClaire ClearlyClaire merged commit b2e7af8 into glitch-soc:main Jun 6, 2024
41 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.
10 participants
@ClearlyClaire @mjankowski @shleeable @renchap @nschonni @vmstan @filippog @ThisIsMissEm @Gargron @fabiosammy