Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
5543967
chore(deps): update dependency rollup-plugin-visualizer to v6.0.4 (#3…
renovate[bot] Oct 3, 2025
1561517
New Crowdin Translations (automated) (#36345)
github-actions[bot] Oct 3, 2025
80c8a84
Fix redirect to external object when URL is missing or malformed (#36…
ClearlyClaire Oct 3, 2025
62f91ed
Do not display mute button in hashtag dropdown when unauthenticated (…
mkljczk Oct 5, 2025
2d2c525
Split `timeline_preview` setting into more granular settings (#36338)
ClearlyClaire Oct 6, 2025
4dc21d7
New Crowdin Translations (automated) (#36349)
github-actions[bot] Oct 6, 2025
ffac4cb
Emoji: Link Replacement (#36341)
ChaosExAnima Oct 6, 2025
68a36d5
Allow modern_emojis to be enabled purely server-side (#36342)
ChaosExAnima Oct 6, 2025
cda0768
Add feature to automatically attach quote on eligible link past in We…
ClearlyClaire Oct 6, 2025
4a40f81
Link to local accounts from settings (#36340)
diondiondion Oct 6, 2025
474fbb2
Fetch all replies: Only display "More replies found" prompt when ther…
diondiondion Oct 6, 2025
9027d60
Emoji: Remove re: from handleElement in StatusContent (#36366)
ChaosExAnima Oct 6, 2025
e8dab02
Fix quote mailer preview to use the latest quote notification (#36373)
renchap Oct 7, 2025
a7f89d1
Change index on `follows` table to improve performance of some querie…
ClearlyClaire Oct 7, 2025
adcbab5
New Crowdin Translations (automated) (#36371)
github-actions[bot] Oct 7, 2025
63bbe4e
Display quotes in email notifications (#36379)
diondiondion Oct 7, 2025
d51717c
Update dependency vite to v7.1.9 (#36332)
renovate[bot] Oct 7, 2025
fb6fd7b
Update dependency pino to v9.13.1 (#36337)
renovate[bot] Oct 7, 2025
da6ae98
Update dependency ioredis to v5.8.1 (#36361)
renovate[bot] Oct 7, 2025
c578a0c
Resolve typescript eslint warning (#36314)
braddunbar Oct 7, 2025
3c9b828
Emoji: Bypass legacy emoji normalization (#36377)
ChaosExAnima Oct 7, 2025
e02ea3e
Emoji: Compare history modal (#36378)
ChaosExAnima Oct 7, 2025
bc7119b
Remove unused feature flag from sample configuration file (#36382)
ClearlyClaire Oct 7, 2025
aa7bcd3
Update formatjs monorepo (#36356)
renovate[bot] Oct 7, 2025
e4c3854
Ensure Fetch-all-replies snackbar is shown at the bottom of the scree…
diondiondion Oct 7, 2025
092f46f
Use bundler version 2.7.2 (#36367)
mjankowski Oct 8, 2025
4fce433
Update `rack` and `uri` to the latest release (#36389)
renchap Oct 8, 2025
3867f3b
New Crowdin Translations (automated) (#36386)
github-actions[bot] Oct 8, 2025
6abda76
Emoji: Account page (#36385)
ChaosExAnima Oct 8, 2025
987f1e8
Fix JSON payload being potentially mutated when processing interactio…
ClearlyClaire Oct 8, 2025
d8f0326
Update dependency sidekiq to v8.0.8 (#36388)
renovate[bot] Oct 8, 2025
0be0a88
Fix Update/Delete of quoted status not being forwarded to quoters's f…
ClearlyClaire Oct 8, 2025
4fd5b6e
Update opentelemetry-ruby (non-major) (#36313)
renovate[bot] Oct 8, 2025
2b213e9
Update dependency ruby to v3.4.7 (#36387)
renovate[bot] Oct 8, 2025
0c1ca6c
Emoji: Statuses (#36393)
ChaosExAnima Oct 8, 2025
5c92312
Update dependency cross-env to v10.1.0 (#36297)
renovate[bot] Oct 8, 2025
babb7b2
Emoji: Announcements (#36397)
ChaosExAnima Oct 8, 2025
b8444d9
Do not automatically run Prettier on the streaming server code. (#36400)
renchap Oct 8, 2025
5bc7c4b
Emoji: Fixes issue with handled link not correctly showing remote use…
ChaosExAnima Oct 8, 2025
0152659
Use tag filter for pending tag count on admin dashboard (#36404)
mjankowski Oct 9, 2025
ba70dcf
Update docker.io/ruby Docker tag to v3.4.7 (#36407)
renovate[bot] Oct 9, 2025
a459ccf
New Crowdin Translations (automated) (#36406)
github-actions[bot] Oct 9, 2025
b7c5e60
Fix quote post state sometimes not being updated through streaming se…
ClearlyClaire Oct 9, 2025
d4a4a71
Fix crash when serializing quotes of deleted posts for ActivityPub (#…
ClearlyClaire Oct 9, 2025
2588692
Fix: Embed author handle using wrong DisplayName (#36413)
ChaosExAnima Oct 9, 2025
c858fc7
Fixes handled link formatting (#36410)
ChaosExAnima Oct 9, 2025
81350c7
Add support for displaying link previews for Admin UI (#35958)
ThisIsMissEm Oct 10, 2025
8898f12
Improve display of content warnings in Admin UI (#35935)
ThisIsMissEm Oct 10, 2025
3f2ee09
New Crowdin Translations (automated) (#36420)
github-actions[bot] Oct 10, 2025
0219b7c
Add `result_count` to `Mastodon-Async-Refresh` header when needed (#3…
ClearlyClaire Oct 10, 2025
ab93e9f
Update dependency `rack` (#36443)
ClearlyClaire Oct 13, 2025
8b78c03
New Crowdin Translations (automated) (#36433)
github-actions[bot] Oct 13, 2025
692cfe2
Update dependency opentelemetry-instrumentation-excon to v0.25.2 (#36…
renovate[bot] Oct 13, 2025
8d09e4e
Merge commit from fork
ThisIsMissEm Oct 13, 2025
24dcb18
Merge commit from fork
ThisIsMissEm Oct 13, 2025
7e98fa9
Merge commit from fork
ThisIsMissEm Oct 13, 2025
2971ac9
Fix streaming still being authorized for suspended accounts (#36448)
ClearlyClaire Oct 13, 2025
254fff9
Bump version to v4.4.6 (#36447)
ClearlyClaire Oct 13, 2025
33f739d
Fix permalink redirects continuing to work for suspended accounts (#3…
Gargron Oct 13, 2025
edd7fd9
Emoji: Picker native rendering (#36454)
ChaosExAnima Oct 13, 2025
58c56da
Merge remote-tracking branch 'parent/main' into upstream-20251013
kmycode Oct 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .env.production.sample
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ SESSION_RETENTION_PERIOD=31556952

# Fetch All Replies Behavior
# --------------------------
# When a user expands a post (DetailedStatus view), fetch all of its replies
# (default: false)
FETCH_REPLIES_ENABLED=false

# Period to wait between fetching replies (in minutes)
FETCH_REPLIES_COOLDOWN_MINUTES=15
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.6
3.4.7
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,48 @@

All notable changes to this project will be documented in this file.

## [4.4.6] - 2025-10-13

### Security

- Update dependencies `rack` and `uri`
- Fix streaming server connection not being closed on user suspension (by @ThisIsMissEm, [GHSA-r2fh-jr9c-9pxh](https://github.com/mastodon/mastodon/security/advisories/GHSA-r2fh-jr9c-9pxh))
- Fix password change through admin CLI not invalidating existing sessions and access tokens (by @ThisIsMissEm, [GHSA-f3q3-rmf7-9655](https://github.com/mastodon/mastodon/security/advisories/GHSA-f3q3-rmf7-9655))
- Fix streaming server allowing access to public timelines even without the `read` or `read:statuses` OAuth scopes (by @ThisIsMissEm, [GHSA-7gwh-mw97-qjgp](https://github.com/mastodon/mastodon/security/advisories/GHSA-7gwh-mw97-qjgp))

### Added

- Add support for processing quotes of deleted posts signaled through a `Tombstone` (#36381 by @ClearlyClaire)

### Fixed

- Fix quote post state sometimes not being updated through streaming server (#36408 by @ClearlyClaire)
- Fix inconsistent “pending tags” count on admin dashboard (#36404 by @mjankowski)
- Fix JSON payload being potentially mutated when processing interaction policies (#36392 by @ClearlyClaire)
- Fix quotes not being displayed in email notifications (#36379 by @diondiondion)
- Fix redirect to external object when URL is missing or malformed (#36347 by @ClearlyClaire)
- Fix quotes not being displayed in the featured carousel (#36335 by @diondiondion)

## [4.4.5] - 2025-09-23

### Security

- Update dependencies

### Added

- Add support for `has:quote` in search (#36217 by @ClearlyClaire)

### Changed

- Change quoted posts from silenced accounts to use a click-through rather than being hidden (#36166 and #36167 by @ClearlyClaire)

### Fixed

- Fix processing of out-of-order `Update` as implicit updates (#36190 by @ClearlyClaire)
- Fix getting `Create` and `Update` out of order (#36176 by @ClearlyClaire)
- Fix quotes with Content Warnings but no text being shown without Content Warnings (#36150 by @ClearlyClaire)

## [4.4.4] - 2025-09-16

### Security
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG BASE_REGISTRY="docker.io"

# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.4.x"]
# renovate: datasource=docker depName=docker.io/ruby
ARG RUBY_VERSION="3.4.6"
ARG RUBY_VERSION="3.4.7"
# # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
# renovate: datasource=node-version depName=node
ARG NODE_MAJOR_VERSION="22"
Expand Down
26 changes: 13 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,19 @@ gem 'opentelemetry-api', '~> 1.7.0'

group :opentelemetry do
gem 'opentelemetry-exporter-otlp', '~> 0.30.0', require: false
gem 'opentelemetry-instrumentation-active_job', '~> 0.8.0', require: false
gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.22.0', require: false
gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.22.0', require: false
gem 'opentelemetry-instrumentation-excon', '~> 0.24.0', require: false
gem 'opentelemetry-instrumentation-faraday', '~> 0.28.0', require: false
gem 'opentelemetry-instrumentation-http', '~> 0.25.0', require: false
gem 'opentelemetry-instrumentation-http_client', '~> 0.24.0', require: false
gem 'opentelemetry-instrumentation-net_http', '~> 0.24.0', require: false
gem 'opentelemetry-instrumentation-pg', '~> 0.30.0', require: false
gem 'opentelemetry-instrumentation-rack', '~> 0.27.0', require: false
gem 'opentelemetry-instrumentation-rails', '~> 0.37.0', require: false
gem 'opentelemetry-instrumentation-redis', '~> 0.26.0', require: false
gem 'opentelemetry-instrumentation-sidekiq', '~> 0.26.0', require: false
gem 'opentelemetry-instrumentation-active_job', '~> 0.9.0', require: false
gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.23.0', require: false
gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.23.0', require: false
gem 'opentelemetry-instrumentation-excon', '~> 0.25.0', require: false
gem 'opentelemetry-instrumentation-faraday', '~> 0.29.0', require: false
gem 'opentelemetry-instrumentation-http', '~> 0.26.0', require: false
gem 'opentelemetry-instrumentation-http_client', '~> 0.25.0', require: false
gem 'opentelemetry-instrumentation-net_http', '~> 0.25.0', require: false
gem 'opentelemetry-instrumentation-pg', '~> 0.31.0', require: false
gem 'opentelemetry-instrumentation-rack', '~> 0.28.0', require: false
gem 'opentelemetry-instrumentation-rails', '~> 0.38.0', require: false
gem 'opentelemetry-instrumentation-redis', '~> 0.27.0', require: false
gem 'opentelemetry-instrumentation-sidekiq', '~> 0.27.0', require: false
gem 'opentelemetry-sdk', '~> 1.4', require: false
end

Expand Down
Loading