Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3183 from ClearlyClaire/glitch-soc/merge-4.3

Browse Source 
Merge upstream changes up to 51b29f4c30 to stable-4.3
This commit is contained in:
Claire
2025-09-16 18:17:29 +02:00
committed by GitHub
parent de488fbea2 5f07606955
commit 21b324cc88
4 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.md
View File

@@ -2,6 +2,18 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [4.3.12] - 2025-09-16
### Security
- Update dependencies
### Fixed
- Fix processing of remote edited statuses with new media and no text (#35970 by @unfokus)
- Fix “Edit” and “Delete & Redraft” on a poll not inserting empty option (#35892 by @ClearlyClaire)
- Fix self-destruct scheduler behavior on some Redis setups (#35823 by @ClearlyClaire)
## [4.3.11] - 2025-08-05 ## [4.3.11] - 2025-08-05
### Security ### Security

106
Gemfile.lock
View File

@@ -10,35 +10,35 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.1.5.1) actioncable (7.1.5.2)
actionpack (= 7.1.5.1) actionpack (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
actionmailbox (7.1.5.1) actionmailbox (7.1.5.2)
actionpack (= 7.1.5.1) actionpack (= 7.1.5.2)
activejob (= 7.1.5.1) activejob (= 7.1.5.2)
activerecord (= 7.1.5.1) activerecord (= 7.1.5.2)
activestorage (= 7.1.5.1) activestorage (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
mail (>= 2.7.1) mail (>= 2.7.1)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
actionmailer (7.1.5.1) actionmailer (7.1.5.2)
actionpack (= 7.1.5.1) actionpack (= 7.1.5.2)
actionview (= 7.1.5.1) actionview (= 7.1.5.2)
activejob (= 7.1.5.1) activejob (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
actionpack (7.1.5.1) actionpack (7.1.5.2)
actionview (= 7.1.5.1) actionview (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
racc racc
rack (>= 2.2.4) rack (>= 2.2.4)
@@ -46,15 +46,15 @@ GEM
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
actiontext (7.1.5.1) actiontext (7.1.5.2)
actionpack (= 7.1.5.1) actionpack (= 7.1.5.2)
activerecord (= 7.1.5.1) activerecord (= 7.1.5.2)
activestorage (= 7.1.5.1) activestorage (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.1.5.1) actionview (7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.11) erubi (~> 1.11)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
@@ -64,22 +64,22 @@ GEM
activemodel (>= 4.1) activemodel (>= 4.1)
case_transform (>= 0.2) case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3) jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (7.1.5.1) activejob (7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.1.5.1) activemodel (7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
activerecord (7.1.5.1) activerecord (7.1.5.2)
activemodel (= 7.1.5.1) activemodel (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
timeout (>= 0.4.0) timeout (>= 0.4.0)
activestorage (7.1.5.1) activestorage (7.1.5.2)
actionpack (= 7.1.5.1) actionpack (= 7.1.5.2)
activejob (= 7.1.5.1) activejob (= 7.1.5.2)
activerecord (= 7.1.5.1) activerecord (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
marcel (~> 1.0) marcel (~> 1.0)
activesupport (7.1.5.1) activesupport (7.1.5.2)
base64 base64
benchmark (>= 0.3) benchmark (>= 0.3)
bigdecimal bigdecimal
@@ -642,20 +642,20 @@ GEM
rackup (1.0.0) rackup (1.0.0)
rack (< 3) rack (< 3)
webrick webrick
rails (7.1.5.1) rails (7.1.5.2)
actioncable (= 7.1.5.1) actioncable (= 7.1.5.2)
actionmailbox (= 7.1.5.1) actionmailbox (= 7.1.5.2)
actionmailer (= 7.1.5.1) actionmailer (= 7.1.5.2)
actionpack (= 7.1.5.1) actionpack (= 7.1.5.2)
actiontext (= 7.1.5.1) actiontext (= 7.1.5.2)
actionview (= 7.1.5.1) actionview (= 7.1.5.2)
activejob (= 7.1.5.1) activejob (= 7.1.5.2)
activemodel (= 7.1.5.1) activemodel (= 7.1.5.2)
activerecord (= 7.1.5.1) activerecord (= 7.1.5.2)
activestorage (= 7.1.5.1) activestorage (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.1.5.1) railties (= 7.1.5.2)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1)
@@ -670,9 +670,9 @@ GEM
rails-i18n (7.0.9) rails-i18n (7.0.9)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8) railties (>= 6.0.0, < 8)
railties (7.1.5.1) railties (7.1.5.2)
actionpack (= 7.1.5.1) actionpack (= 7.1.5.2)
activesupport (= 7.1.5.1) activesupport (= 7.1.5.2)
irb irb
rackup (>= 1.0.0) rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)

6
docker-compose.yml
View File

@@ -59,7 +59,7 @@ services:
web: web:
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
# build: . # build: .
image: ghcr.io/glitch-soc/mastodon:v4.3.11 image: ghcr.io/glitch-soc/mastodon:v4.3.12
restart: always restart: always
env_file: .env.production env_file: .env.production
command: bundle exec puma -C config/puma.rb command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
# build: # build:
# dockerfile: ./streaming/Dockerfile # dockerfile: ./streaming/Dockerfile
# context: . # context: .
image: ghcr.io/glitch-soc/mastodon-streaming:v4.3.11 image: ghcr.io/glitch-soc/mastodon-streaming:v4.3.12
restart: always restart: always
env_file: .env.production env_file: .env.production
command: node ./streaming/index.js command: node ./streaming/index.js
@@ -102,7 +102,7 @@ services:
sidekiq: sidekiq:
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
# build: . # build: .
image: ghcr.io/glitch-soc/mastodon:v4.3.11 image: ghcr.io/glitch-soc/mastodon:v4.3.12
restart: always restart: always
env_file: .env.production env_file: .env.production
command: bundle exec sidekiq command: bundle exec sidekiq

2
lib/mastodon/version.rb
View File

@@ -13,7 +13,7 @@ module Mastodon
end end
def patch def patch
11 12
end end
def default_prerelease def default_prerelease