switch to path merged

This commit is contained in:
Torsten 2023-01-16 19:32:38 +02:00
parent 62b7f139d9
commit 21b13fba2e
2 changed files with 13 additions and 14 deletions

View File

@ -23,8 +23,8 @@ gem "simple_form" , "5.1.0"
gem "simple_form_tailwind_css" gem "simple_form_tailwind_css"
gem 'kaminari' gem 'kaminari'
gem "merged" , git: "https://github.com/HubFeenixMakers/merged" #gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
#gem "merged" , path: "../merged" gem "merged" , path: "../merged"
gem "passenger" , require: "phusion_passenger/rack_handler" gem "passenger" , require: "phusion_passenger/rack_handler"

View File

@ -1,6 +1,14 @@
GIT GIT
remote: https://github.com/HubFeenixMakers/merged remote: https://github.com/ruby2js/ruby2js/
revision: a8f5229935e22f5aa8092647ec8c610477bdaa98 revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
branch: haml_fix
specs:
ruby2js (5.0.1)
parser
regexp_parser (~> 2.1.1)
PATH
remote: ../merged
specs: specs:
merged (0.1.0) merged (0.1.0)
active_hash active_hash
@ -11,15 +19,6 @@ GIT
redcarpet redcarpet
ruby2js (~> 5.0, >= 5.0.1) 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 GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -144,7 +143,7 @@ GEM
formatador (1.1.0) formatador (1.1.0)
friendly_id (5.5.0) friendly_id (5.5.0)
activerecord (>= 4.0.0) activerecord (>= 4.0.0)
git (1.13.0) git (1.13.1)
addressable (~> 2.8) addressable (~> 2.8)
rchardet (~> 1.8) rchardet (~> 1.8)
globalid (1.0.0) globalid (1.0.0)