From 81e199d6e3c9b4e5d9b82a880cf3f562b5e6bec3 Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 14 May 2023 17:16:55 +0300 Subject: [PATCH] update --- Gemfile | 4 ++-- Gemfile.lock | 27 ++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 2ffe90c..5dd813e 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 c365ec6..9c1f917 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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: e55936c8c3507d430614d18b457ae5526c0e0252 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: @@ -91,7 +92,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) autoprefixer-rails (10.4.7.0) @@ -263,7 +264,7 @@ GEM sanitize open4 (1.3.4) orm_adapter (0.5.0) - parser (3.2.1.0) + parser (3.2.2.1) ast (~> 2.4.1) passenger (6.0.15) rack @@ -392,7 +393,7 @@ GEM sassc-rails (>= 2.0.0) sprockets-es6 timeago_js (>= 3.0.2.2) - tilt (2.0.11) + tilt (2.1.0) timeago_js (3.0.2.2) timeout (0.3.2) tzinfo (2.0.6)