From 64366d8a5bdd8f0812f93c45d407c0827edf5e61 Mon Sep 17 00:00:00 2001
From: as-op <a.sandorf@openproject.com>
Date: Wed, 19 Apr 2023 10:32:04 +0200
Subject: [PATCH] merge dev

---
 Gemfile.lock | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3ea1828c4fd..88ddfd041c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,17 @@
+GIT
+  remote: https://github.com/opf/md-to-pdf
+  revision: 4337f5d2b9601f8ab726576200bcfb2066417fc0
+  ref: 4337f5d2b9601f8ab726576200bcfb2066417fc0
+  specs:
+    md_to_pdf (0.0.15)
+      commonmarker (~> 0.23)
+      front_matter_parser (~> 1.0)
+      matrix (~> 0.4)
+      nokogiri (~> 1.14)
+      prawn (~> 2.4)
+      prawn-table (~> 0.2)
+      text-hyphen (~> 1.5)
+
 GIT
   remote: https://github.com/opf/omniauth
   revision: fe862f986b2e846e291784d2caa3d90a658c67f0
@@ -351,6 +365,7 @@ GEM
     closure_tree (7.4.0)
       activerecord (>= 4.2.10)
       with_advisory_lock (>= 4.0.0)
+    cmdparse (3.0.7)
     coderay (1.1.3)
     colored2 (3.1.2)
     commonmarker (0.23.9)
@@ -466,12 +481,14 @@ GEM
     formatador (1.1.0)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
+    front_matter_parser (1.0.1)
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
+    geom2d (0.3.1)
     globalid (1.1.0)
       activesupport (>= 5.0)
     gon (6.4.0)
@@ -512,6 +529,10 @@ GEM
     hashdiff (1.0.1)
     hashery (2.1.2)
     hashie (3.6.0)
+    hexapdf (0.32.0)
+      cmdparse (~> 3.0, >= 3.0.3)
+      geom2d (~> 0.3)
+      openssl (>= 2.2.1)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
@@ -640,6 +661,7 @@ GEM
       webfinger (~> 2.0)
     openproject-token (3.0.1)
       activemodel
+    openssl (3.1.0)
     os (1.1.4)
     ox (2.14.16)
     paper_trail (12.3.0)
@@ -668,10 +690,6 @@ GEM
     prawn (2.4.0)
       pdf-core (~> 0.9.0)
       ttfunk (~> 1.7)
-    prawn-markup (0.3.7)
-      nokogiri
-      prawn
-      prawn-table
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     pry (0.14.2)
@@ -906,6 +924,7 @@ GEM
     table_print (1.5.7)
     temple (0.10.0)
     test-prof (1.2.1)
+    text-hyphen (1.5.0)
     thor (1.2.1)
     tilt (2.1.0)
     timecop (0.9.6)
@@ -1023,6 +1042,7 @@ DEPENDENCIES
   grape (~> 1.7.0)
   grape_logging (~> 1.8.4)
   grids!
+  hexapdf (~> 0.32)
   html-pipeline (~> 2.14.0)
   htmldiff
   i18n-js (~> 3.9.0)
@@ -1036,7 +1056,7 @@ DEPENDENCIES
   livingstyleguide (~> 2.1.0)
   lograge (~> 0.12.0)
   mail (= 2.8.1)
-  matrix (~> 0.4.2)
+  md_to_pdf!
   meta-tags (~> 2.18.0)
   mini_magick (~> 4.12.0)
   multi_json (~> 1.15.0)
@@ -1079,7 +1099,6 @@ DEPENDENCIES
   plaintext (~> 0.3.2)
   posix-spawn (~> 0.3.13)
   prawn (~> 2.2)
-  prawn-markup (~> 0.3.0)
   pry-byebug (~> 3.10.0)
   pry-rails (~> 0.3.6)
   pry-rescue (~> 1.5.2)