Emergency fix for charlock_holmes after ICU 75

This commit is contained in:
Jeremy Kescher 2024-05-21 03:37:40 +02:00
parent 47884616f7
commit c9fb54fd4c
No known key found for this signature in database
GPG key ID: 80A419A7A613DFA4
4 changed files with 15 additions and 4 deletions

View file

@ -2,6 +2,11 @@
All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
## [v4.3.0-alpha.3+glitch+cat+1.2.4] - 2024-05-21
- Emergency release to fix production after ICU version 75 broke a dependency of Mastodon, `charlock_holmes`, in places
that are not used in Mastodon.
## [v4.3.0-alpha.3+glitch+cat+1.2.3] - 2024-05-21
- Upstream changes, once again (including, but not limited to:)

View file

@ -28,7 +28,7 @@ gem 'active_model_serializers', '~> 0.10'
gem 'addressable', '~> 2.8'
gem 'bootsnap', '~> 1.18.0', require: false
gem 'browser'
gem 'charlock_holmes', '~> 0.7.7'
gem 'charlock_holmes', github: 'kescher-temp-forks/charlock_holmes', ref: '0a6a8eb2f759477e618e58b81e85365b2b67d306'
gem 'chewy', '~> 7.3'
gem 'devise', '~> 4.9'
gem 'devise-two-factor'

View file

@ -7,6 +7,13 @@ GIT
hkdf (~> 0.2)
jwt (~> 2.0)
GIT
remote: https://github.com/kescher-temp-forks/charlock_holmes.git
revision: 0a6a8eb2f759477e618e58b81e85365b2b67d306
ref: 0a6a8eb2f759477e618e58b81e85365b2b67d306
specs:
charlock_holmes (0.7.7)
GEM
remote: https://rubygems.org/
specs:
@ -159,7 +166,6 @@ GEM
case_transform (0.2)
activesupport
cbor (0.5.9.8)
charlock_holmes (0.7.7)
chewy (7.6.0)
activesupport (>= 5.2)
elasticsearch (>= 7.14.0, < 8)
@ -913,7 +919,7 @@ DEPENDENCIES
browser
bundler-audit (~> 0.9)
capybara (~> 3.39)
charlock_holmes (~> 0.7.7)
charlock_holmes!
chewy (~> 7.3)
climate_control
cocoon (~> 1.2)

View file

@ -25,7 +25,7 @@ module Mastodon
end
def catstodon_revision
'1.2.3'
'1.2.4'
end
def build_metadata