tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update redis gem to version 5.4.1 (#38110)

Browse Source
This commit is contained in:
Matt Jankowski 2026-04-13 03:44:06 -04:00 committed by GitHub
parent 73fc8d34d9
commit bb64905b21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -50,7 +50,6 @@ gem 'doorkeeper', '~> 5.6'
gem 'faraday-httpclient' gem 'faraday-httpclient'
gem 'fast_blank', '~> 1.0' gem 'fast_blank', '~> 1.0'
gem 'fastimage' gem 'fastimage'
gem 'hiredis', '~> 0.6'
gem 'hiredis-client' gem 'hiredis-client'
gem 'htmlentities', '~> 4.3' gem 'htmlentities', '~> 4.3'
gem 'http', '~> 5.3.0' gem 'http', '~> 5.3.0'
@ -76,7 +75,7 @@ gem 'rack-attack', '~> 6.6'
gem 'rack-cors', require: 'rack/cors' gem 'rack-cors', require: 'rack/cors'
gem 'rails-i18n', '~> 8.0' gem 'rails-i18n', '~> 8.0'
gem 'redcarpet', '~> 3.6' gem 'redcarpet', '~> 3.6'
gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis'] gem 'redis', '~> 5'
gem 'rqrcode', '~> 3.0' gem 'rqrcode', '~> 3.0'
gem 'ruby-progressbar', '~> 1.13' gem 'ruby-progressbar', '~> 1.13'
gem 'sanitize', '~> 7.0' gem 'sanitize', '~> 7.0'

7
Gemfile.lock
View File

@ -305,7 +305,6 @@ GEM
json json
highline (3.1.2) highline (3.1.2)
reline reline
hiredis (0.6.3)
hiredis-client (0.28.0) hiredis-client (0.28.0)
redis-client (= 0.28.0) redis-client (= 0.28.0)
hkdf (0.3.0) hkdf (0.3.0)
@ -709,7 +708,8 @@ GEM
readline (0.0.4) readline (0.0.4)
reline reline
redcarpet (3.6.1) redcarpet (3.6.1)
redis (4.8.1) redis (5.4.1)
redis-client (>= 0.22.0)
redis-client (0.28.0) redis-client (0.28.0)
connection_pool connection_pool
regexp_parser (2.11.3) regexp_parser (2.11.3)
@ -985,7 +985,6 @@ DEPENDENCIES
haml-rails (~> 3.0) haml-rails (~> 3.0)
haml_lint haml_lint
hcaptcha (~> 7.1) hcaptcha (~> 7.1)
hiredis (~> 0.6)
hiredis-client hiredis-client
htmlentities (~> 4.3) htmlentities (~> 4.3)
http (~> 5.3.0) http (~> 5.3.0)
@ -1055,7 +1054,7 @@ DEPENDENCIES
rails-i18n (~> 8.0) rails-i18n (~> 8.0)
rdf-normalize (~> 0.5) rdf-normalize (~> 0.5)
redcarpet (~> 3.6) redcarpet (~> 3.6)
redis (~> 4.5) redis (~> 5)
rqrcode (~> 3.0) rqrcode (~> 3.0)
rspec-github (~> 3.0) rspec-github (~> 3.0)
rspec-rails (~> 8.0) rspec-rails (~> 8.0)

2
app/workers/activitypub/fetch_all_replies_worker.rb
View File

@ -49,7 +49,7 @@ class ActivityPub::FetchAllRepliesWorker
# Workers shouldn't be returning anything, but this is used in tests # Workers shouldn't be returning anything, but this is used in tests
fetched_uris fetched_uris
ensure ensure
@batch.remove_job(jid) @batch.remove_job(jid) if jid
end end
private private

3
config/initializers/redis.rb
View File

@ -1,3 +0,0 @@
# frozen_string_literal: true
Redis.sadd_returns_boolean = false