update merged
This commit is contained in:
parent
1cbb29f16a
commit
e37ca75da5
4
Gemfile
4
Gemfile
@ -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"
|
||||||
|
|
||||||
|
21
Gemfile.lock
21
Gemfile.lock
@ -1,6 +1,14 @@
|
|||||||
GIT
|
GIT
|
||||||
remote: https://github.com/HubFeenixMakers/merged
|
remote: https://github.com/ruby2js/ruby2js/
|
||||||
revision: 3a15e58ee38dae847ff877c261ce9856e00c74fb
|
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:
|
||||||
|
Loading…
Reference in New Issue
Block a user