gem merged

This commit is contained in:
Torsten 2023-01-13 13:58:11 +02:00
parent 6de7f4ca09
commit a8082a1682
2 changed files with 14 additions and 13 deletions

View File

@ -27,8 +27,8 @@ gem "rest-client"
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"
gem "passenger" , require: "phusion_passenger/rack_handler"

View File

@ -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: a8f5229935e22f5aa8092647ec8c610477bdaa98
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:
@ -145,7 +146,7 @@ GEM
formatador (1.1.0)
friendly_id (5.5.0)
activerecord (>= 4.0.0)
git (1.13.0)
git (1.13.1)
addressable (~> 2.8)
rchardet (~> 1.8)
globalid (1.0.0)