add merged as submodule

2022-11-28 20:16:45 +02:00 · 2022-11-28 20:16:45 +02:00 · c440cb9a80
commit c440cb9a80
parent bfff38ac3c
4 changed files with 13 additions and 0 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "merged"]
+	path = merged
+	url = git@github.com:HubFeenixMakers/merged.git
--- a/2
+++ b/2
@ -16,6 +16,8 @@ gem "sassc-rails"
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 # gem "image_processing", "~> 1.2"

+gem "merged" , path: 'merged'
+
 group :production do
  gem "passenger"
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,3 +1,9 @@
+PATH
+  remote: merged
+  specs:
+    merged (0.1.0)
+      rails (>= 7.0.4)
+
 GEM
  remote: https://rubygems.org/
  specs:
@ -216,6 +222,7 @@ DEPENDENCIES
  capybara
  debug
  importmap-rails
+  merged!
  passenger
  pg (~> 1.1)
  puma (~> 5.0)
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit f97ce5ae7b67c25f24229416fbad656dca861124
				`@ -0,0 +1 @@`
				`Subproject commit f97ce5ae7b67c25f24229416fbad656dca861124`