diff --git a/Gemfile b/Gemfile index 5dd813e..2ffe90c 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" ruby "3.1.3" -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 "rails", "~> 7.0" diff --git a/Gemfile.lock b/Gemfile.lock index ebba3f7..030d580 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,14 @@ GIT - remote: https://github.com/HubFeenixMakers/merged - revision: 3a15e58ee38dae847ff877c261ce9856e00c74fb + 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 specs: merged (0.1.0) active_hash @@ -11,15 +19,6 @@ GIT 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: