From d13e999d960a97a4f8586efd6d6f86dc5571b00d Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Mon, 18 Sep 2023 13:13:41 +0300
Subject: [PATCH] update merged

---
 Gemfile.lock | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4c5937e..ceb40b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/HubFeenixMakers/merged
-  revision: 78f47614fa2e160990f74b23c7e63d856d913655
+  revision: a28ca85a371a89c0934d3d5e33b64e8270d15bfe
   specs:
     merged (0.1.0)
       active_hash
@@ -68,7 +68,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_hash (3.1.1)
+    active_hash (3.2.0)
       activesupport (>= 5.0.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
@@ -92,7 +92,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.7.0)
@@ -147,7 +147,7 @@ GEM
     formatador (1.1.0)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
-    git (1.13.2)
+    git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     globalid (1.2.1)
@@ -165,7 +165,7 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    haml (6.1.1)
+    haml (6.1.2)
       temple (>= 0.8.2)
       thor
       tilt
@@ -264,8 +264,9 @@ GEM
       sanitize
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    parser (3.2.1.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     passenger (6.0.15)
       rack
       rake (>= 0.8.1)
@@ -273,7 +274,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     pundit (2.3.0)
       activesupport (>= 3.0.0)
     racc (1.7.1)
@@ -372,7 +373,7 @@ GEM
       concurrent-ruby (~> 1.0)
     tailwindcss-rails (2.0.21-x86_64-linux)
       railties (>= 6.0.0)
-    temple (0.10.0)
+    temple (0.10.2)
     thor (1.2.2)
     thredded (1.0.1)
       active_record_union (>= 1.3.0)
@@ -395,7 +396,7 @@ GEM
       sassc-rails (>= 2.0.0)
       sprockets-es6
       timeago_js (>= 3.0.2.2)
-    tilt (2.0.11)
+    tilt (2.3.0)
     timeago_js (3.0.2.2)
     timeout (0.4.0)
     tzinfo (2.0.6)