Skip to content

Commit 6928acb

Browse files
committed
Gemfile pin gd2-ffij workaround: dark-panda/gd2-ffij#28
1 parent 17a3141 commit 6928acb

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ gem "logstasher"
128128
# Used to generate images for traces
129129
gem "bzip2-ffi"
130130
gem "ffi-libarchive"
131-
gem "gd2-ffij", ">= 0.4.0"
131+
# Use https://github.com/dark-panda/gd2-ffij/pull/28
132+
gem 'gd2-ffij', :github => "rkoeze/gd2-ffij", :ref => "a203a8d5ef004a4198950e86329228fe3f331d06"
132133
gem "marcel"
133134

134135
# Used for S3 object storage

Gemfile.lock

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ GIT
66
active_record_union (1.3.0)
77
activerecord (>= 6.0)
88

9+
GIT
10+
remote: https://github.com/rkoeze/gd2-ffij.git
11+
revision: a203a8d5ef004a4198950e86329228fe3f331d06
12+
ref: a203a8d5ef004a4198950e86329228fe3f331d06
13+
specs:
14+
gd2-ffij (0.4.1.dev)
15+
ffi (>= 1.0.0)
16+
917
GEM
1018
remote: https://rubygems.org/
1119
specs:
@@ -290,8 +298,6 @@ GEM
290298
frozen_record (0.27.4)
291299
activemodel
292300
fspath (3.1.2)
293-
gd2-ffij (0.4.0)
294-
ffi (>= 1.0.0)
295301
git (1.19.1)
296302
addressable (~> 2.8)
297303
rchardet (~> 1.8)
@@ -732,7 +738,7 @@ DEPENDENCIES
732738
ffi-libarchive
733739
file_exists
734740
frozen_record
735-
gd2-ffij (>= 0.4.0)
741+
gd2-ffij!
736742
htmlentities
737743
http_accept_language (~> 2.1.1)
738744
i18n-js (~> 4.2.3)

0 commit comments

Comments
 (0)