Skip to content

Commit f31af2f

Browse files
committed
pin 2.x html-pipeline asset that thredded depends on
1 parent 95b5615 commit f31af2f

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ gem "sentry-rails"
8282
#gem 'levenshtein-ffi'
8383

8484
# Forum
85+
gem "html-pipeline", "~> 2.14" # keep the pre-3.x API that Thredded expects
8586
gem 'thredded', git: 'https://github.com/indentlabs/thredded.git', branch: 'feature/report-posts'
8687
# gem 'thredded', path: "../thredded"
8788

Gemfile.lock

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,9 +1375,9 @@ GEM
13751375
activerecord (>= 4.0.0)
13761376
globalid (1.1.0)
13771377
activesupport (>= 5.0)
1378-
html-pipeline (3.2.2)
1379-
selma (~> 0.4)
1380-
zeitwerk (~> 2.5)
1378+
html-pipeline (2.14.3)
1379+
activesupport (>= 2)
1380+
nokogiri (>= 1.4)
13811381
htmlentities (4.3.4)
13821382
http (4.4.1)
13831383
addressable (~> 2.3)
@@ -1568,12 +1568,9 @@ GEM
15681568
rake (>= 12.2)
15691569
thor (~> 1.0)
15701570
rake (13.2.1)
1571-
rake-compiler-dock (1.9.1)
15721571
rb-fsevent (0.11.2)
15731572
rb-inotify (0.10.1)
15741573
ffi (~> 1.0)
1575-
rb_sys (0.9.111)
1576-
rake-compiler-dock (= 1.9.1)
15771574
react-rails (2.6.2)
15781575
babel-transpiler (>= 0.7.0)
15791576
connection_pool
@@ -1618,9 +1615,6 @@ GEM
16181615
rexml (~> 3.2, >= 3.2.5)
16191616
rubyzip (>= 1.2.2, < 3.0)
16201617
websocket (~> 1.0)
1621-
selma (0.4.12)
1622-
rb_sys (~> 0.9)
1623-
selma (0.4.12-x86_64-linux)
16241618
semantic_range (3.0.0)
16251619
sentry-rails (5.23.0)
16261620
railties (>= 5.0)
@@ -1736,6 +1730,7 @@ DEPENDENCIES
17361730
filesize
17371731
flamegraph
17381732
font-awesome-rails
1733+
html-pipeline (~> 2.14)
17391734
htmlentities
17401735
ibm_watson
17411736
image_processing

0 commit comments

Comments
 (0)