From 8b1806ac6c4f58b830fb02a47e018f64efd09be9 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 15 May 2024 10:10:07 +0200
Subject: [PATCH] Pin `thredded` to new Git commit & remove `html-parser`

---
 Gemfile      |  4 ++--
 Gemfile.lock | 53 ++++++++++++++++++++++++++++------------------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/Gemfile b/Gemfile
index d300a1561..81419a97c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,6 @@ gem "erubis"
 gem "exception_handler", "~> 0.8.0.0"
 gem "faraday", "~> 1.8"
 gem "fuzzy-string-match"
-gem "html-pipeline", "~> 2.14"
 gem "jquery-rails"
 gem "jquery-ui-rails"
 gem "js-routes", "1.4.9"
@@ -96,7 +95,8 @@ gem "sunspot_rails",
     github: "sunspot/sunspot",
     glob: "sunspot_rails/*.gemspec"
 gem "sunspot_solr"
-gem "thredded"
+gem "thredded", git: "https://github.com/thredded/thredded.git",
+                ref: "1340e913affd1af5fcc060fbccd271184ece9a6a"
 gem "thredded-markdown_katex",
     git: "https://github.com/thredded/thredded-markdown_katex.git",
     branch: "main"
diff --git a/Gemfile.lock b/Gemfile.lock
index bb7841bd3..87e30b105 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,6 +26,33 @@ GIT
       katex (>= 0.4.3)
       kramdown-math-katex
 
+GIT
+  remote: https://github.com/thredded/thredded.git
+  revision: 1340e913affd1af5fcc060fbccd271184ece9a6a
+  ref: 1340e913affd1af5fcc060fbccd271184ece9a6a
+  specs:
+    thredded (1.1.0)
+      active_record_union (>= 1.3.0)
+      autoprefixer-rails
+      db_text_search
+      friendly_id
+      html-pipeline (>= 2.14.1, < 3)
+      htmlentities
+      inline_svg (>= 1.6.0)
+      kaminari
+      kramdown (>= 2.0.0)
+      kramdown-parser-gfm
+      nokogiri
+      onebox (>= 1.8.99)
+      pundit (>= 1.1.0)
+      rails (> 6.0.0.rc2)
+      rails_gravatar
+      rinku
+      sanitize
+      sassc-rails (>= 2.0.0)
+      sprockets-es6
+      timeago_js (>= 3.0.2.2)
+
 GIT
   remote: https://github.com/zdennis/activerecord-import.git
   revision: f41a5782b0a3f19cf42e88063aa4adbefafe4092
@@ -402,7 +429,7 @@ GEM
     public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
-    pundit (2.3.1)
+    pundit (2.3.2)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.3)
@@ -603,27 +630,6 @@ GEM
     terser (1.2.2)
       execjs (>= 0.3.0, < 3)
     thor (1.3.1)
-    thredded (1.1.0)
-      active_record_union (>= 1.3.0)
-      autoprefixer-rails
-      db_text_search
-      friendly_id
-      html-pipeline (>= 2.14.1)
-      htmlentities
-      inline_svg (>= 1.6.0)
-      kaminari
-      kramdown (>= 2.0.0)
-      kramdown-parser-gfm
-      nokogiri
-      onebox (>= 1.8.99)
-      pundit (>= 1.1.0)
-      rails (> 6.0.0.rc2)
-      rails_gravatar
-      rinku
-      sanitize
-      sassc-rails (>= 2.0.0)
-      sprockets-es6
-      timeago_js (>= 3.0.2.2)
     tilt (2.3.0)
     timeago_js (3.0.2.2)
     timeout (0.4.1)
@@ -697,7 +703,6 @@ DEPENDENCIES
   fastimage
   filesize
   fuzzy-string-match
-  html-pipeline (~> 2.14)
   image_processing
   jbuilder
   jquery-rails
@@ -747,7 +752,7 @@ DEPENDENCIES
   sunspot_rails!
   sunspot_solr
   terser
-  thredded
+  thredded!
   thredded-markdown_katex!
   trix-rails
   turbolinks (~> 5)