FeenixMakers/residency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update merged

Browse Source
This commit is contained in:
Torsten 2023-01-19 00:13:11 +02:00
parent 0ce1452fe3
commit 4f0fb3d105
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
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"

21
Gemfile.lock
View File

@ -1,14 +1,6 @@
GIT GIT
remote: https://github.com/ruby2js/ruby2js/ remote: https://github.com/HubFeenixMakers/merged
revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d revision: 6a8dc3f8c6bf28549e80b9a2d8e4e218b0bdf001
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: