From 28cf174c22c8e10bc4e2a2eea7394badfebeb9f8 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@villataika.fi>
Date: Sat, 21 Oct 2023 22:32:04 +0300
Subject: [PATCH] update merged (pushes)

---
 Gemfile      |  2 +-
 Gemfile.lock | 34 +++++++++++++++-------------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index c8f03b7..e5cdf88 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby "3.1.3"
 gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
 #gem "merged" , path: "../merged"
 
-gem "rails", "~> 7.0"
+gem "rails", "~> 7.0.0"
 
 gem "sprockets-rails"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index da13920..eea4d20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,9 @@
 GIT
   remote: https://github.com/HubFeenixMakers/merged
-  revision: a28ca85a371a89c0934d3d5e33b64e8270d15bfe
+  revision: 2d5f8d972a69081444379a110e9fd6302dca6431
   specs:
     merged (0.1.0)
       active_hash
-      git
       haml-rails
       mini_magick
       rails (>= 7.0.4)
@@ -68,7 +67,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_hash (3.2.0)
+    active_hash (3.2.1)
       activesupport (>= 5.0.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
@@ -92,7 +91,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.4)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.7.0)
@@ -147,9 +146,6 @@ GEM
     formatador (1.1.0)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
-    git (1.18.0)
-      addressable (~> 2.8)
-      rchardet (~> 1.8)
     globalid (1.2.1)
       activesupport (>= 6.1)
     guard (2.18.0)
@@ -165,7 +161,7 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    haml (6.1.1)
+    haml (6.2.3)
       temple (>= 0.8.2)
       thor
       tilt
@@ -218,7 +214,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lumberjack (1.2.8)
@@ -240,14 +236,14 @@ GEM
     multi_json (1.15.0)
     mustache (1.1.1)
     nenv (0.3.0)
-    net-imap (0.3.7)
+    net-imap (0.4.2)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.15.4-x86_64-linux)
@@ -264,8 +260,9 @@ GEM
       sanitize
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    parser (3.2.2.1)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
     passenger (6.0.15)
       rack
       rake (>= 0.8.1)
@@ -273,7 +270,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)
@@ -318,7 +315,6 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rchardet (1.8.0)
     redcarpet (3.6.0)
     regexp_parser (2.1.1)
     reline (0.3.2)
@@ -372,8 +368,8 @@ GEM
       concurrent-ruby (~> 1.0)
     tailwindcss-rails (2.0.21-x86_64-linux)
       railties (>= 6.0.0)
-    temple (0.10.0)
-    thor (1.2.2)
+    temple (0.10.3)
+    thor (1.3.0)
     thredded (1.0.1)
       active_record_union (>= 1.3.0)
       autoprefixer-rails
@@ -395,7 +391,7 @@ GEM
       sassc-rails (>= 2.0.0)
       sprockets-es6
       timeago_js (>= 3.0.2.2)
-    tilt (2.1.0)
+    tilt (2.3.0)
     timeago_js (3.0.2.2)
     timeout (0.4.0)
     tzinfo (2.0.6)
@@ -417,7 +413,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   x86_64-linux
@@ -440,7 +436,7 @@ DEPENDENCIES
   passenger (= 6.0.15)
   pg (~> 1.1)
   pundit (~> 2.3)
-  rails (~> 7.0)
+  rails (~> 7.0.0)
   ransack
   ruby2js!
   sassc-rails