new merged, commits
This commit is contained in:
parent
52c494aec2
commit
6c1895fc96
4
Gemfile
4
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"
|
||||
|
||||
|
28
Gemfile.lock
28
Gemfile.lock
@ -1,3 +1,15 @@
|
||||
GIT
|
||||
remote: https://github.com/HubFeenixMakers/merged
|
||||
revision: 6f3a7349b22bbda53ab0eece6d16d3d9e2f03ecc
|
||||
specs:
|
||||
merged (0.1.0)
|
||||
active_hash
|
||||
haml-rails
|
||||
mini_magick
|
||||
rails (>= 7.0.4)
|
||||
redcarpet
|
||||
ruby2js (~> 5.0, >= 5.0.1)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/ruby2js/ruby2js/
|
||||
revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
|
||||
@ -7,18 +19,6 @@ GIT
|
||||
parser
|
||||
regexp_parser (~> 2.1.1)
|
||||
|
||||
PATH
|
||||
remote: ../merged
|
||||
specs:
|
||||
merged (0.1.0)
|
||||
active_hash
|
||||
git
|
||||
haml-rails
|
||||
mini_magick
|
||||
rails (>= 7.0.4)
|
||||
redcarpet
|
||||
ruby2js (~> 5.0, >= 5.0.1)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
@ -151,9 +151,6 @@ GEM
|
||||
formatador (1.1.0)
|
||||
friendly_id (5.5.0)
|
||||
activerecord (>= 4.0.0)
|
||||
git (1.18.0)
|
||||
addressable (~> 2.8)
|
||||
rchardet (~> 1.8)
|
||||
globalid (1.2.1)
|
||||
activesupport (>= 6.1)
|
||||
guard (2.18.0)
|
||||
@ -331,7 +328,6 @@ GEM
|
||||
rb-fsevent (0.11.2)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rchardet (1.8.0)
|
||||
redcarpet (3.6.0)
|
||||
regexp_parser (2.1.1)
|
||||
reline (0.3.2)
|
||||
|
Loading…
Reference in New Issue
Block a user