From 7cdaef455b0c5199750c0befae6b83e392cbcb1b Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Tue, 3 Jan 2023 14:41:17 +0200
Subject: [PATCH] move to github version of merged

---
 Gemfile      |  6 +++---
 Gemfile.lock | 33 +++++++++++++++++----------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4d6c260..a57e25e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 ruby "3.0.4"
 
-gem "rails", "~> 7.0.4"
+gem "rails", "~> 7.0"
 
 gem "sprockets-rails"
 gem "pg", "~> 1.1"
@@ -22,8 +22,8 @@ gem 'thredded', '~> 1.0'
 gem "simple_form" , "5.1.0"
 gem "simple_form_tailwind_css"
 
-#gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
-gem "merged" , path: "../merged"
+gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
+#gem "merged" , path: "../merged"
 
 group :production do
   gem "passenger"
diff --git a/Gemfile.lock b/Gemfile.lock
index 254165e..e35b9fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,6 @@
 GIT
-  remote: https://github.com/ruby2js/ruby2js/
-  revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
-  branch: haml_fix
-  specs:
-    ruby2js (5.0.1)
-      parser
-      regexp_parser (~> 2.1.1)
-
-PATH
-  remote: ../merged
+  remote: https://github.com/HubFeenixMakers/merged
+  revision: 693d121c0fc4f223ae49c841ef957eab4bda9230
   specs:
     merged (0.1.0)
       active_hash
@@ -19,6 +11,15 @@ PATH
       redcarpet
       ruby2js (~> 5.0, >= 5.0.1)
 
+GIT
+  remote: https://github.com/ruby2js/ruby2js/
+  revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
+  branch: haml_fix
+  specs:
+    ruby2js (5.0.1)
+      parser
+      regexp_parser (~> 2.1.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -136,7 +137,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    erubi (1.11.0)
+    erubi (1.12.0)
     erubis (2.7.0)
     execjs (2.8.1)
     ffi (1.15.5)
@@ -231,12 +232,12 @@ GEM
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.2)
-    minitest (5.16.3)
+    minitest (5.17.0)
     msgpack (1.6.0)
     multi_json (1.15.0)
     mustache (1.1.1)
     nenv (0.3.0)
-    net-imap (0.3.2)
+    net-imap (0.3.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -274,8 +275,8 @@ GEM
       nio4r (~> 2.0)
     pundit (2.3.0)
       activesupport (>= 3.0.0)
-    racc (1.6.1)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.5)
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (7.0.4)
@@ -428,7 +429,7 @@ DEPENDENCIES
   passenger
   pg (~> 1.1)
   puma (~> 5.0)
-  rails (~> 7.0.4)
+  rails (~> 7.0)
   ruby2js!
   sassc-rails
   selenium-webdriver