FeenixMakers/volunteers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add merged as submodule

Browse Source
This commit is contained in:
Torsten 2022-11-28 20:16:45 +02:00
parent bfff38ac3c
commit c440cb9a80
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "merged"]
path = merged
url = git@github.com:HubFeenixMakers/merged.git

2
Gemfile
View File

@ -16,6 +16,8 @@ gem "sassc-rails"
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
# gem "image_processing", "~> 1.2" # gem "image_processing", "~> 1.2"
gem "merged" , path: 'merged'
group :production do group :production do
gem "passenger" gem "passenger"
end end

7
Gemfile.lock
View File

@ -1,3 +1,9 @@
PATH
remote: merged
specs:
merged (0.1.0)
rails (>= 7.0.4)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -216,6 +222,7 @@ DEPENDENCIES
capybara capybara
debug debug
importmap-rails importmap-rails
merged!
passenger passenger
pg (~> 1.1) pg (~> 1.1)
puma (~> 5.0) puma (~> 5.0)

1
merged Submodule

@ -0,0 +1 @@
Subproject commit f97ce5ae7b67c25f24229416fbad656dca861124