Skip to content

Commit 4684d5e

Browse files
Merge pull request #3269 from ClearlyClaire/glitch-soc/merge-4.5
Merge upstream changes up to 26c7839
2 parents 81b1a34 + 3ca92c4 commit 4684d5e

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

.github/workflows/build-releases.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
# Only tag with latest when ran against the latest stable branch
2121
# This needs to be updated after each minor version release
2222
flavor: |
23-
latest=${{ startsWith(github.ref, 'refs/tags/v4.3.') }}
23+
latest=${{ startsWith(github.ref, 'refs/tags/v4.5.') }}
2424
tags: |
2525
type=pep440,pattern={{raw}}
2626
type=pep440,pattern=v{{major}}.{{minor}}
@@ -37,7 +37,7 @@ jobs:
3737
# Only tag with latest when ran against the latest stable branch
3838
# This needs to be updated after each minor version release
3939
flavor: |
40-
latest=${{ startsWith(github.ref, 'refs/tags/v4.3.') }}
40+
latest=${{ startsWith(github.ref, 'refs/tags/v4.5.') }}
4141
tags: |
4242
type=pep440,pattern={{raw}}
4343
type=pep440,pattern=v{{major}}.{{minor}}

CHANGELOG.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

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

5-
## [4.5.0] - UNRELEASED
5+
## [4.5.0] - 2025-11-06
66

77
### Added
88

9-
- **Add support for allowing and authoring quotes** (#35355, #35578, #35614, #35618, #35624, #35626, #35652, #35629, #35665, #35653, #35670, #35677, #35690, #35697, #35689, #35699, #35700, #35701, #35709, #35714, #35713, #35715, #35725, #35749, #35769, #35780, #35762, #35804, #35808, #35805, #35819, #35824, #35828, #35822, #35835, #35865, #35860, #35832, #35891, #35894, #35895, #35820, #35917, #35924, #35925, #35914, #35930, #35941, #35939, #35948, #35955, #35967, #35990, #35991, #35975, #35971, #36002, #35986, #36031, #36034, #36038, #36054, #36052, #36055, #36065, #36068, #36083, #36087, #36080, #36091, #36090, #36118, #36119, #36128, #36094, #36129, #36138, #36132, #36151, #36158, #36171, #36194, #36220, #36169, #36130, #36249, #36153, #36299, #36291, #36301, #36315, #36317, #36364, #36383, #36381, #36459, #36464, #36461, #36516, #36528, #36549, #36550, #36559, #36693, #36704, #36690, #36689, #36696, #36721 and #36695 by @ChaosExAnima, @ClearlyClaire, @Lycolia, @diondiondion, and @tribela)\
9+
- **Add support for allowing and authoring quotes** (#35355, #35578, #35614, #35618, #35624, #35626, #35652, #35629, #35665, #35653, #35670, #35677, #35690, #35697, #35689, #35699, #35700, #35701, #35709, #35714, #35713, #35715, #35725, #35749, #35769, #35780, #35762, #35804, #35808, #35805, #35819, #35824, #35828, #35822, #35835, #35865, #35860, #35832, #35891, #35894, #35895, #35820, #35917, #35924, #35925, #35914, #35930, #35941, #35939, #35948, #35955, #35967, #35990, #35991, #35975, #35971, #36002, #35986, #36031, #36034, #36038, #36054, #36052, #36055, #36065, #36068, #36083, #36087, #36080, #36091, #36090, #36118, #36119, #36128, #36094, #36129, #36138, #36132, #36151, #36158, #36171, #36194, #36220, #36169, #36130, #36249, #36153, #36299, #36291, #36301, #36315, #36317, #36364, #36383, #36381, #36459, #36464, #36461, #36516, #36528, #36549, #36550, #36559, #36693, #36704, #36690, #36689, #36696, #36721, #36695 and #36736 by @ChaosExAnima, @ClearlyClaire, @Lycolia, @diondiondion, and @tribela)\
1010
This includes a revamp of the composer interface.\
1111
See https://blog.joinmastodon.org/2025/09/introducing-quote-posts/ for a user-centric overview of the feature, and https://docs.joinmastodon.org/client/quotes/ for API documentation.
1212
- **Add support for fetching and refreshing replies to the web UI** (#35210, #35496, #35575, #35500, #35577, #35602, #35603, #35654, #36141, #36237, #36172, #36256, #36271, #36334, #36382, #36239, #36484, #36481, #36583, #36627 and #36547 by @ClearlyClaire, @diondiondion, @Gargron and @renchap)
@@ -21,21 +21,22 @@ All notable changes to this project will be documented in this file.
2121
- Add support for `Update` activities on converted object types (#36322 by @ClearlyClaire)
2222
- Add support for dynamic viewport height (#36272 by @e1berd)
2323
- Add support for numeric-based URIs for new local accounts (#32724, #36304, #36316, and #36365 by @ClearlyClaire)
24+
- Add default visualizer for audio upload without poster (#36734 by @ChaosExAnima)
2425
- Add Traditional Mongolian to posting languages (#36196 by @shimon1024)
2526
- Add example post with manual quote approval policy to `dev:populate_sample_data` (#36099 by @ClearlyClaire)
2627
- Add server-side support for handling posts with a quote policy allowing followers to quote (#36093 and #36127 by @ClearlyClaire)
2728
- Add schema.org markup to SEO-enabled posts (#36075 by @Gargron)
2829
- Add migration to fill unset default quote policy based on default post privacy (#36041 by @ClearlyClaire)
30+
- Add “Posting defaults” setting page, moving existing settings from “Other” (#35896, #36033, #35966, #35969, and #36084 by @ClearlyClaire and @diondiondion)
31+
- Added emoji from Twemoji v16 (#36501 and #36530 by @ChaosExAnima)
32+
- Add feature to select custom emoji rendering (#35229, #35282, #35253, #35424, #35473, #35483, #35505, #35568, #35605, #35659, #35664, #35739, #35985, #36051, #36071, #36137, #36165, #36248, #36262, #36275, #36293, #36341, #36342, #36366, #36377, #36378, #36385, #36393, #36397, #36403, #36413, #36410, #36454, #36402, #36503, #36502, #36532, #36603, #36409, #36638 and #36750 by @ChaosExAnima, @ClearlyClaire and @braddunbar)\
33+
This also completely reworks the processing and rendering of emojis and server-rendered HTML in statuses and other places.
2934
- Add support for exposing conversation context for new public conversations according to FEP-7888 (#35959 and #36064 by @ClearlyClaire and @jesseplusplus)
3035
- Add digest re-check before removing followers in synchronization mechanism (#34273 by @ClearlyClaire)
31-
- Add “Posting defaults” setting page, moving existing settings from “Other” (#35896, #36033, #35966, #35969, and #36084 by @ClearlyClaire and @diondiondion)
3236
- Add support for displaying Valkey version on admin dashboard (#35785 by @ykzts)
3337
- Add delivery failure tracking and handling to FASP jobs (#35625, #35628, and #35723 by @oneiros)
3438
- Add example of quote post with a preview card to development sample data (#35616 by @ClearlyClaire)
3539
- Add second set of blocked text that applies to accounts regardless of account age for spam-blocking (#35563 by @ClearlyClaire)
36-
- Added emoji from Twemoji v16 (#36501 and #36530 by @ChaosExAnima)
37-
- Add feature to select custom emoji rendering (#35229, #35282, #35253, #35424, #35473, #35483, #35505, #35568, #35605, #35659, #35664, #35739, #35985, #36051, #36071, #36137, #36165, #36248, #36262, #36275, #36293, #36341, #36342, #36366, #36377, #36378, #36385, #36393, #36397, #36403, #36413, #36410, #36454, #36402, #36503, #36502, #36532, #36603, #36409 and #36638 by @ChaosExAnima, @ClearlyClaire and @braddunbar)\
38-
This also completely reworks the processing and rendering of emojis and server-rendered HTML in statuses and other places.
3940

4041
### Changed
4142

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through
1616
| Version | Supported |
1717
| ------- | ---------------- |
1818
| 4.4.x | Yes |
19-
| 4.3.x | Yes |
19+
| 4.3.x | Until 2026-05-06 |
2020
| 4.2.x | Until 2026-01-08 |
2121
| < 4.2 | No |

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ services:
5959
web:
6060
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
6161
# build: .
62-
image: ghcr.io/glitch-soc/mastodon:v4.4.8
62+
image: ghcr.io/glitch-soc/mastodon:v4.5.0
6363
restart: always
6464
env_file: .env.production
6565
command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
8383
# build:
8484
# dockerfile: ./streaming/Dockerfile
8585
# context: .
86-
image: ghcr.io/glitch-soc/mastodon-streaming:v4.4.8
86+
image: ghcr.io/glitch-soc/mastodon-streaming:v4.5.0
8787
restart: always
8888
env_file: .env.production
8989
command: node ./streaming/index.js
@@ -102,7 +102,7 @@ services:
102102
sidekiq:
103103
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
104104
# build: .
105-
image: ghcr.io/glitch-soc/mastodon:v4.4.8
105+
image: ghcr.io/glitch-soc/mastodon:v4.5.0
106106
restart: always
107107
env_file: .env.production
108108
command: bundle exec sidekiq

lib/mastodon/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def patch
1717
end
1818

1919
def default_prerelease
20-
'rc.3'
20+
''
2121
end
2222

2323
def prerelease

0 commit comments

Comments
 (0)