From 7d24d24d539b0381fb85957467c105301f15c9f3 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@villataika.fi>
Date: Sat, 21 Oct 2023 22:30:21 +0300
Subject: [PATCH] update merged, fixed

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

diff --git a/Gemfile b/Gemfile
index 33642fd..165aced 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"
 gem "pg", "~> 1.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index e73e649..0166e6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/HubFeenixMakers/merged
-  revision: 6f3a7349b22bbda53ab0eece6d16d3d9e2f03ecc
+  revision: 2d5f8d972a69081444379a110e9fd6302dca6431
   specs:
     merged (0.1.0)
       active_hash
@@ -166,7 +166,7 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    haml (6.1.2)
+    haml (6.2.3)
       temple (>= 0.8.2)
       thor
       tilt
@@ -225,7 +225,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)
@@ -251,14 +251,14 @@ GEM
     multi_xml (0.6.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
     netrc (0.11.0)
     newrelic_rpm (8.16.0)
@@ -277,7 +277,7 @@ GEM
       sanitize
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     passenger (6.0.15)
@@ -386,8 +386,8 @@ GEM
       concurrent-ruby (~> 1.0)
     tailwindcss-rails (2.0.21-x86_64-linux)
       railties (>= 6.0.0)
-    temple (0.10.2)
-    thor (1.2.2)
+    temple (0.10.3)
+    thor (1.3.0)
     thredded (1.0.1)
       active_record_union (>= 1.3.0)
       autoprefixer-rails
@@ -436,7 +436,7 @@ GEM
       chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   x86_64-linux
@@ -462,7 +462,7 @@ DEPENDENCIES
   passenger (= 6.0.15)
   pg (~> 1.1)
   pundit
-  rails (~> 7.0)
+  rails (~> 7.0.0)
   rest-client
   ruby2js!
   sassc-rails