mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 01:53:41 +01:00
Emergency fix for charlock_holmes after ICU 75
This commit is contained in:
parent
47884616f7
commit
c9fb54fd4c
4 changed files with 15 additions and 4 deletions
|
@ -2,6 +2,11 @@
|
||||||
|
|
||||||
All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
|
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
|
## [v4.3.0-alpha.3+glitch+cat+1.2.3] - 2024-05-21
|
||||||
|
|
||||||
- Upstream changes, once again (including, but not limited to:)
|
- Upstream changes, once again (including, but not limited to:)
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -28,7 +28,7 @@ gem 'active_model_serializers', '~> 0.10'
|
||||||
gem 'addressable', '~> 2.8'
|
gem 'addressable', '~> 2.8'
|
||||||
gem 'bootsnap', '~> 1.18.0', require: false
|
gem 'bootsnap', '~> 1.18.0', require: false
|
||||||
gem 'browser'
|
gem 'browser'
|
||||||
gem 'charlock_holmes', '~> 0.7.7'
|
gem 'charlock_holmes', github: 'kescher-temp-forks/charlock_holmes', ref: '0a6a8eb2f759477e618e58b81e85365b2b67d306'
|
||||||
gem 'chewy', '~> 7.3'
|
gem 'chewy', '~> 7.3'
|
||||||
gem 'devise', '~> 4.9'
|
gem 'devise', '~> 4.9'
|
||||||
gem 'devise-two-factor'
|
gem 'devise-two-factor'
|
||||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -7,6 +7,13 @@ GIT
|
||||||
hkdf (~> 0.2)
|
hkdf (~> 0.2)
|
||||||
jwt (~> 2.0)
|
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
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
@ -159,7 +166,6 @@ GEM
|
||||||
case_transform (0.2)
|
case_transform (0.2)
|
||||||
activesupport
|
activesupport
|
||||||
cbor (0.5.9.8)
|
cbor (0.5.9.8)
|
||||||
charlock_holmes (0.7.7)
|
|
||||||
chewy (7.6.0)
|
chewy (7.6.0)
|
||||||
activesupport (>= 5.2)
|
activesupport (>= 5.2)
|
||||||
elasticsearch (>= 7.14.0, < 8)
|
elasticsearch (>= 7.14.0, < 8)
|
||||||
|
@ -913,7 +919,7 @@ DEPENDENCIES
|
||||||
browser
|
browser
|
||||||
bundler-audit (~> 0.9)
|
bundler-audit (~> 0.9)
|
||||||
capybara (~> 3.39)
|
capybara (~> 3.39)
|
||||||
charlock_holmes (~> 0.7.7)
|
charlock_holmes!
|
||||||
chewy (~> 7.3)
|
chewy (~> 7.3)
|
||||||
climate_control
|
climate_control
|
||||||
cocoon (~> 1.2)
|
cocoon (~> 1.2)
|
||||||
|
|
|
@ -25,7 +25,7 @@ module Mastodon
|
||||||
end
|
end
|
||||||
|
|
||||||
def catstodon_revision
|
def catstodon_revision
|
||||||
'1.2.3'
|
'1.2.4'
|
||||||
end
|
end
|
||||||
|
|
||||||
def build_metadata
|
def build_metadata
|
||||||
|
|
Loading…
Reference in a new issue