diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..a5e29d5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "merged"] + path = merged + url = git@github.com:HubFeenixMakers/merged.git diff --git a/Gemfile b/Gemfile index 7b39b12..18f4454 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index f52edde..ed5ecee 100644 --- 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) diff --git a/merged b/merged new file mode 160000 index 0000000..f97ce5a --- /dev/null +++ b/merged @@ -0,0 +1 @@ +Subproject commit f97ce5ae7b67c25f24229416fbad656dca861124