This commit is contained in:
Torsten 2023-05-14 17:16:55 +03:00
parent 6274400832
commit 81e199d6e3
2 changed files with 16 additions and 15 deletions

View File

@ -2,8 +2,8 @@ source "https://rubygems.org"
ruby "3.1.3" ruby "3.1.3"
#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 "rails", "~> 7.0" gem "rails", "~> 7.0"

View File

@ -1,14 +1,6 @@
GIT GIT
remote: https://github.com/ruby2js/ruby2js/ remote: https://github.com/HubFeenixMakers/merged
revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d revision: e55936c8c3507d430614d18b457ae5526c0e0252
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
@ -19,6 +11,15 @@ PATH
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:
@ -91,7 +92,7 @@ GEM
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
tzinfo (~> 2.0) tzinfo (~> 2.0)
addressable (2.8.1) addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0) public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2) ast (2.4.2)
autoprefixer-rails (10.4.7.0) autoprefixer-rails (10.4.7.0)
@ -263,7 +264,7 @@ GEM
sanitize sanitize
open4 (1.3.4) open4 (1.3.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parser (3.2.1.0) parser (3.2.2.1)
ast (~> 2.4.1) ast (~> 2.4.1)
passenger (6.0.15) passenger (6.0.15)
rack rack
@ -392,7 +393,7 @@ GEM
sassc-rails (>= 2.0.0) sassc-rails (>= 2.0.0)
sprockets-es6 sprockets-es6
timeago_js (>= 3.0.2.2) timeago_js (>= 3.0.2.2)
tilt (2.0.11) tilt (2.1.0)
timeago_js (3.0.2.2) timeago_js (3.0.2.2)
timeout (0.3.2) timeout (0.3.2)
tzinfo (2.0.6) tzinfo (2.0.6)